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 c717aac581046759c00b881708a21035c286dfc2..9f32b7a1f5403f92eb05c68b14042fa63ce162d3 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -96,6 +96,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|.
@@ -650,8 +651,9 @@ 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) ||
+        content_settings_->ShouldDisplay(site_url_, permission_info.type)) {
       permission_info_list.push_back(permission_info);
     }
   }