Adding <keygen> Content Setting (UI)

chrome/browser/ui/website_settings/website_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 78 matching lines @@
     CONTENT_SETTINGS_TYPE_JAVASCRIPT,
     CONTENT_SETTINGS_TYPE_POPUPS,
     CONTENT_SETTINGS_TYPE_FULLSCREEN,
     CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
     CONTENT_SETTINGS_TYPE_PLUGINS,
     CONTENT_SETTINGS_TYPE_MOUSELOCK,
     CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
 #if defined(OS_ANDROID)
     CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
 #endif
+    CONTENT_SETTINGS_TYPE_KEYGEN,
 };
 
 // Returns true if any of the given statuses match |status|.
 bool CertificateTransparencyStatusMatchAny(
     const std::vector<net::ct::SCTVerifyStatus>& sct_verify_statuses,
     net::ct::SCTVerifyStatus status) {
   for (const auto& verify_status : sct_verify_statuses) {
     if (verify_status == status)
       return true;
   }
@@ skipping 534 matching lines @@
     if (info.primary_pattern == ContentSettingsPattern::Wildcard() &&
         info.secondary_pattern == ContentSettingsPattern::Wildcard()) {
       permission_info.default_setting = permission_info.setting;
       permission_info.setting = CONTENT_SETTING_DEFAULT;
     } else {
       permission_info.default_setting =
           content_settings_->GetDefaultContentSetting(permission_info.type,
                                                       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);
     }
   }
 
   ui_->SetPermissionInfo(permission_info_list);
 }
 
 void WebsiteSettings::PresentSiteData() {
   CookieInfoList cookie_info_list;
   const LocalSharedObjectsCounter& allowed_objects =
@@ skipping 35 matching lines @@
   info.connection_status = site_connection_status_;
   info.connection_status_description =
       UTF16ToUTF8(site_connection_details_);
   info.identity_status = site_identity_status_;
   info.identity_status_description =
       UTF16ToUTF8(site_identity_details_);
   info.cert_id = cert_id_;
   info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
   ui_->SetIdentityInfo(info);
 }