Chromium Code Reviews| Index: chrome/renderer/content_settings_observer.h |
| diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h |
| index 37a70438c0c6657565877e219ac6202eb6b463ff..3c9aeebea1addc120915dfa00e6680b68c155d8c 100644 |
| --- a/chrome/renderer/content_settings_observer.h |
| +++ b/chrome/renderer/content_settings_observer.h |
| @@ -77,6 +77,7 @@ class ContentSettingsObserver |
| bool allowMutationEvents(bool default_value) override; |
| void didNotAllowPlugins() override; |
| void didNotAllowScript() override; |
| + void didUseKeygen() override; |
| bool allowDisplayingInsecureContent(bool allowed_per_settings, |
| const blink::WebSecurityOrigin& context, |
| const blink::WebURL& url) override; |
| @@ -143,14 +144,14 @@ class ContentSettingsObserver |
| // |SetContentSettingRules|. |
| const RendererContentSettingRules* content_setting_rules_; |
| - // Stores if images, scripts, and plugins have actually been blocked. |
| + // Stores if images, scripts, keygen, and plugins have actually been blocked. |
|
jochen (gone - plz use gerrit)
2015/11/25 08:54:34
revert this change
svaldez
2015/11/25 14:56:55
Done.
|
| std::map<ContentSettingsType, bool> content_blocked_; |
| // Caches the result of AllowStorage. |
| typedef std::pair<GURL, bool> StoragePermissionsKey; |
| std::map<StoragePermissionsKey, bool> cached_storage_permissions_; |
| - // Caches the result of |AllowScript|. |
| + // Caches the result of AllowScript. |
| std::map<blink::WebFrame*, bool> cached_script_permissions_; |
| std::set<std::string> temporarily_allowed_plugins_; |