Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9432)

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings.h

Issue 319553008: Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comments Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 063faa95fe36c2409d6d0d5dd24e9084cb363de0..b3d367e8d57545dd5e9efa28c3d3211b512ff8eb 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.h
+++ b/chrome/browser/content_settings/tab_specific_content_settings.h
@@ -258,6 +258,15 @@ class TabSpecificContentSettings
return pending_protocol_handler_setting_;
}
+ // Set whether the setting for the plugin bubble mode is Allow, Block or Run
Bernhard Bauer 2014/06/16 09:43:15 Nit: "Model", not "mode". Also, can we please not
radhikabhar 2014/06/16 18:21:37 Changed it and to remember the user selection for
+ // this time.
+ void set_plugin_bubble_setting(ContentSetting setting) {
+ plugin_bubble_setting_ = setting;
+ }
+
+ ContentSetting plugin_bubble_setting() const {
+ return plugin_bubble_setting_;
+ }
// Returns a pointer to the |LocalSharedObjectsContainer| that contains all
// allowed local shared objects like cookies, local storage, ... .
@@ -271,11 +280,6 @@ class TabSpecificContentSettings
return blocked_local_shared_objects_;
}
- bool load_plugins_link_enabled() { return load_plugins_link_enabled_; }
- void set_load_plugins_link_enabled(bool enabled) {
- load_plugins_link_enabled_ = enabled;
- }
-
// Called to indicate whether access to the Pepper broker was allowed or
// blocked.
void SetPepperBrokerAllowed(bool allowed);
@@ -405,8 +409,9 @@ class TabSpecificContentSettings
// the user opens the bubble and makes changes multiple times.
ContentSetting pending_protocol_handler_setting_;
- // Stores whether the user can load blocked plugins on this page.
- bool load_plugins_link_enabled_;
+ // The setting on the plugin bubble model. Persisted in case
+ // the user opens the bubble and makes changes multiple times.
+ ContentSetting plugin_bubble_setting_;
content::NotificationRegistrar registrar_;

Powered by Google App Engine
This is Rietveld 408576698