Adding <keygen> Content Setting (UI)

components/content_settings/core/browser/host_content_settings_map.h

Index: components/content_settings/core/browser/host_content_settings_map.h
diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
index 13e4df176f2ddb648cbf34940f76d233f1488e2b..e92f23fd5a8de183488cdfe5d954d5acce445763 100644
--- a/components/content_settings/core/browser/host_content_settings_map.h
+++ b/components/content_settings/core/browser/host_content_settings_map.h
@@ -9,6 +9,7 @@
 #define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_
 
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -243,6 +244,9 @@ class HostContentSettingsMap : public content_settings::Observer,
       const ContentSettingsPattern& secondary_pattern,
       ContentSettingsType content_type);
 
+  void SetShouldDisplay(const GURL& url, ContentSettingsType content_type);
+  bool ShouldDisplay(const GURL& url, ContentSettingsType content_type);
+
   // Adds/removes an observer for content settings changes.
   void AddObserver(content_settings::Observer* observer);
   void RemoveObserver(content_settings::Observer* observer);
@@ -332,6 +336,8 @@ class HostContentSettingsMap : public content_settings::Observer,
   // Whether this settings map is for an OTR session.
   bool is_off_the_record_;
 
+  std::map<GURL, std::set<ContentSettingsType>> display_map_;

[Bernhard Bauer, 2015/12/17 11:56:03]

This should not live in the HostContentSettingsMap, because it's not a content
setting. Also, content settings are usually persistent, while this will stay
around only until the HCSM is destroyed, right? If what you want is to indicate
usage of a content type (allowed or blocked), TabSpecificContentSettings is the
right place for this.

[svaldez, 2015/12/17 15:25:42]

Done.

[Bernhard Bauer, 2015/12/17 15:51:05]

Sorry, I should have been a bit more detailed. TabSpecificContentSettings
already has code to store and find out whether a given content setting was
blocked, with OnContentBlockedWithDetail() and IsContentBlocked(). This is not
keyed on the URL, but as TabSpecificContentSettings has a 1:1 relation to
WebContents, it is stored per tab. Now, I don't know the exact specification in
this case, but for all other content settings this is the desired behavior, as
all the UI elements that indicate blocking are also per tab.

So, you would get by without modifications to TabSpecificContentSettings, and
just check IsContentBlocked() in WebsiteSettingsUI. (You might want to only do
that for the KEYGEN content setting type, just to make sure we don't run into
any weird edge cases with other blocked content setting types.)

+
   // Content setting providers. This is only modified at construction
   // time and by RegisterExtensionService, both of which should happen
   // before any other uses of it.