Chromium Code Reviews| Index: chrome/browser/content_settings/tab_specific_content_settings.h |
| diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h |
| index 1d9c6dc72c22a81cc9f4fd53beba604f619d49f7..bf608d766641277607eeb281a3e936b51fdc9cc1 100644 |
| --- a/chrome/browser/content_settings/tab_specific_content_settings.h |
| +++ b/chrome/browser/content_settings/tab_specific_content_settings.h |
| @@ -8,6 +8,7 @@ |
| #include <string> |
| #include "base/basictypes.h" |
| +#include "base/containers/hash_tables.h" |
| #include "base/memory/ref_counted.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "base/observer_list.h" |
| @@ -184,6 +185,9 @@ class TabSpecificContentSettings |
| // only tracks cookies. |
| bool IsContentAllowed(ContentSettingsType content_type) const; |
| + // Stores the names of plugins that have been blocked for this tab. |
| + const base::string16 blocked_plugin_names() const; |
|
Lei Zhang
2014/12/05 22:18:05
Non-trivial methods should be NamedLikeThis().
Will Harris
2014/12/08 00:21:11
Done.
|
| + |
| const GURL& media_stream_access_origin() const { |
| return media_stream_access_origin_; |
| } |
| @@ -293,6 +297,8 @@ class TabSpecificContentSettings |
| // Message handlers. |
| // TODO(vabr): Only public for tests. Move to a test client. |
| void OnContentBlocked(ContentSettingsType type); |
| + void OnContentBlockedWithDetail(ContentSettingsType type, |
| + const base::string16& details); |
| void OnContentAllowed(ContentSettingsType type); |
| // These methods are invoked on the UI thread by the static functions above. |
| @@ -426,6 +432,9 @@ class TabSpecificContentSettings |
| // the user opens the bubble and makes changes multiple times. |
| ContentSetting pending_protocol_handler_setting_; |
| + // The name(s) of the plugin(s) being blocked. |
| + base::hash_set<base::string16> blocked_plugin_names_; |
| + |
| // Stores whether the user can load blocked plugins on this page. |
| bool load_plugins_link_enabled_; |