Adding <keygen> Content Setting (UI)

chrome/browser/ui/website_settings/website_settings.cc

Index: 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 3f76e09182f05bf7028187083d63d2bf72f2ce29..10f588c5f89d9f3c380b2b49215d3cb41595e90e 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -101,6 +101,7 @@ ContentSettingsType kPermissionType[] = {
 #if defined(OS_ANDROID)
     CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
 #endif
+    CONTENT_SETTINGS_TYPE_KEYGEN,
 };
 
 // Returns true if any of the given statuses match |status|.
@@ -655,8 +656,11 @@ void WebsiteSettings::PresentSitePermissions() {
                                                       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);
     }
   }