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 77 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 166 matching lines @@
   ContentSettingsPattern secondary_pattern;
   if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION ||
       type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX ||
       type == CONTENT_SETTINGS_TYPE_FULLSCREEN) {
     // TODO(markusheintz): The rule we create here should also change the
     // location permission for iframed content.
     primary_pattern = ContentSettingsPattern::FromURLNoWildcard(site_url_);
     secondary_pattern = ContentSettingsPattern::FromURLNoWildcard(site_url_);
   } else if (type == CONTENT_SETTINGS_TYPE_IMAGES ||
              type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
+             type == CONTENT_SETTINGS_TYPE_KEYGEN ||

[msramek, 2015/11/05 16:22:31]

This sounds like a security feature to me, so I would expect it to be set per
origin (FromURLNoWildcard) rather than broadly (FromURL means all subdomains).
Please double-check.

[svaldez, 2015/11/05 16:35:12]

Done.

              type == CONTENT_SETTINGS_TYPE_PLUGINS ||
              type == CONTENT_SETTINGS_TYPE_POPUPS ||
              type == CONTENT_SETTINGS_TYPE_MOUSELOCK ||
              type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS ||
              type == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING) {
     primary_pattern = ContentSettingsPattern::FromURL(site_url_);
     secondary_pattern = ContentSettingsPattern::Wildcard();
   } else if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
              type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
              type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS) {
@@ skipping 444 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);
 }