commit 18120959576e11ad4dec9edd2c3539ed0bba7cc7
author svaldez <svaldez@chromium.org> Thu Jan 14 21:12:49 2016
committer Commit bot <commit-bot@chromium.org> Thu Jan 14 22:03:08 2016
tree 749e65cc27977429e2ff484e383a72d0b8a6769d
parent 0b3d9e187d64ec49a856019d54c9f7c8e9311b9e

Adding <keygen> Content Setting (UI)

Adding the KEYGEN content setting non-Android UI.

BUG=514767

Review URL: https://codereview.chromium.org/1412523003

Cr-Commit-Position: refs/heads/master@{#369542}

chrome/browser/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 5a7fa7b..dfc92c8 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -107,6 +107,7 @@
 #if defined(OS_ANDROID)
     CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
 #endif
+    CONTENT_SETTINGS_TYPE_KEYGEN,
 };
 
 // Determines whether to show permission |type| in the Website Settings UI. Only
@@ -709,8 +710,11 @@
                                                       NULL);
     }
 
-    if (permission_info.setting != CONTENT_SETTING_DEFAULT &&
-        permission_info.setting != permission_info.default_setting) {
+    if ((permission_info.setting != CONTENT_SETTING_DEFAULT &&
+         permission_info.setting != permission_info.default_setting) ||
+        (permission_info.type == CONTENT_SETTINGS_TYPE_KEYGEN &&
+         tab_specific_content_settings()->IsContentBlocked(
+             permission_info.type))) {
       permission_info_list.push_back(permission_info);
     }
   }