Index: chrome/browser/plugins/plugin_prefs.h |
diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h |
index 05c8159d48fcc981a916a87b1de93e1901613705..9f470193b6e44cd310538100cea59b305b58dbe5 100644 |
--- a/chrome/browser/plugins/plugin_prefs.h |
+++ b/chrome/browser/plugins/plugin_prefs.h |
@@ -20,10 +20,6 @@ |
class Profile; |
-namespace base { |
-class ListValue; |
-} |
- |
namespace content { |
struct WebPluginInfo; |
} |
@@ -55,17 +51,6 @@ class PluginPrefs : public RefcountedKeyedService { |
// This method should only be called on the UI thread. |
void SetPrefs(PrefService* prefs); |
- // Enable or disable a plugin group. |
- void EnablePluginGroup(bool enable, const base::string16& group_name); |
- |
- // Enables or disables a specific plugin file, if possible. |
- // If the plugin state can't be changed (because of a policy for example) |
- // then enabling/disabling the plugin is ignored and |callback| is run |
- // with 'false' passed to it. Otherwise the plugin state is changed |
- // and |callback| is run with 'true' passed to it. |
- void EnablePlugin(bool enable, const base::FilePath& file_path, |
- const base::Callback<void(bool)>& callback); |
- |
// Returns whether there is a policy enabling or disabling plugins of the |
// given name. |
PolicyStatus PolicyStatusForPlugin(const base::string16& name) const; |
@@ -81,79 +66,25 @@ class PluginPrefs : public RefcountedKeyedService { |
private: |
friend class base::RefCountedThreadSafe<PluginPrefs>; |
friend class PluginPrefsTest; |
- |
- // PluginState stores a mapping from plugin path to enable/disable state. We |
- // don't simply use a std::map, because we would like to keep the state of |
- // some plugins in sync with each other. |
- class PluginState { |
- public: |
- PluginState(); |
- ~PluginState(); |
- |
- // Returns whether |plugin| is found. If |plugin| cannot be found, |
- // |*enabled| won't be touched. |
- bool Get(const base::FilePath& plugin, bool* enabled) const; |
- void Set(const base::FilePath& plugin, bool enabled); |
- |
- private: |
- base::FilePath ConvertMapKey(const base::FilePath& plugin) const; |
- |
- std::map<base::FilePath, bool> state_; |
- }; |
+ friend class PrintPreviewDialogControllerBrowserTest; |
~PluginPrefs() override; |
- // Called to update one of the policy_xyz patterns below when a |
- // preference changes. |
- void UpdatePatternsAndNotify(std::set<base::string16>* patterns, |
- const std::string& pref_name); |
- |
// Callback for changes to the AlwaysOpenPdfExternally policy. |
void UpdatePdfPolicy(const std::string& pref_name); |
- // Allows unit tests to directly set enforced plugin patterns. |
- void SetPolicyEnforcedPluginPatternsForTests( |
- const std::set<base::string16>& disabled_patterns, |
- const std::set<base::string16>& disabled_exception_patterns, |
- const std::set<base::string16>& enabled_patterns); |
- |
// Allows unit tests to directly set the AlwaysOpenPdfExternally pref. |
void SetAlwaysOpenPdfExternallyForTests(bool always_open_pdf_externally); |
- // Callback for after the plugin groups have been loaded. |
- void EnablePluginGroupInternal( |
- bool enabled, |
- const base::string16& group_name, |
- const std::vector<content::WebPluginInfo>& plugins); |
- void EnablePluginInternal( |
- bool enabled, |
- const base::FilePath& path, |
- PluginFinder* plugin_finder, |
- const base::Callback<void(bool)>& callback, |
- const std::vector<content::WebPluginInfo>& plugins); |
- |
// Called on the UI thread with the plugin data to save the preferences. |
void OnUpdatePreferences(const std::vector<content::WebPluginInfo>& plugins); |
// Sends the notification that plugin data has changed. |
void NotifyPluginStatusChanged(); |
- static void ListValueToStringSet(const base::ListValue* src, |
- std::set<base::string16>* dest); |
- |
- // Checks if |name| matches any of the patterns in |pattern_set|. |
- static bool IsStringMatchedInSet(const base::string16& name, |
- const std::set<base::string16>& pattern_set); |
- |
// Guards access to the following data structures. |
mutable base::Lock lock_; |
- PluginState plugin_state_; |
- std::map<base::string16, bool> plugin_group_state_; |
- |
- std::set<base::string16> policy_disabled_plugin_patterns_; |
- std::set<base::string16> policy_disabled_plugin_exception_patterns_; |
- std::set<base::string16> policy_enabled_plugin_patterns_; |
bool always_open_pdf_externally_; |
// Weak pointer, owns us. Only used as a notification source. |