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

Side by Side Diff: chrome/browser/plugin_prefs.h

Issue 8515021: Move PluginPrefs to use PluginService instead of PluginList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update tests Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/plugin_prefs.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_PLUGIN_PREFS_H_ 5 #ifndef CHROME_BROWSER_PLUGIN_PREFS_H_
6 #define CHROME_BROWSER_PLUGIN_PREFS_H_ 6 #define CHROME_BROWSER_PLUGIN_PREFS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 110
111 // Allows unit tests to directly set enforced plug-in patterns. 111 // Allows unit tests to directly set enforced plug-in patterns.
112 void SetPolicyEnforcedPluginPatterns( 112 void SetPolicyEnforcedPluginPatterns(
113 const std::set<string16>& disabled_patterns, 113 const std::set<string16>& disabled_patterns,
114 const std::set<string16>& disabled_exception_patterns, 114 const std::set<string16>& disabled_exception_patterns,
115 const std::set<string16>& enabled_patterns); 115 const std::set<string16>& enabled_patterns);
116 116
117 // Returns the plugin list to use, either the singleton or the override. 117 // Returns the plugin list to use, either the singleton or the override.
118 webkit::npapi::PluginList* GetPluginList(); 118 webkit::npapi::PluginList* GetPluginList();
119 119
120 // Called on the file thread to update the plug-in state. 120 // Callback for after the plugin groups have been loaded.
121 void EnablePluginInternal(bool enabled, const FilePath& path); 121 void EnablePluginGroupInternal(
122 bool enabled,
123 const string16& group_name,
124 const std::vector<webkit::npapi::PluginGroup>& groups);
125 void EnablePluginInternal(
126 bool enabled,
127 const FilePath& path,
128 const std::vector<webkit::npapi::PluginGroup>& groups);
122 129
123 // Called on the file thread to get the data necessary to update the saved 130 // Called on the file thread to get the data necessary to update the saved
124 // preferences. 131 // preferences.
125 void GetPreferencesDataOnFileThread(); 132 void GetPreferencesDataOnFileThread();
126 133
127 // Called on the UI thread with the plugin data to save the preferences. 134 // Called on the UI thread with the plugin data to save the preferences.
128 void OnUpdatePreferences(std::vector<webkit::npapi::PluginGroup> groups); 135 void OnUpdatePreferences(std::vector<webkit::npapi::PluginGroup> groups);
129 136
130 // Sends the notification that plugin data has changed. 137 // Sends the notification that plugin data has changed.
131 void NotifyPluginStatusChanged(); 138 void NotifyPluginStatusChanged();
(...skipping 24 matching lines...) Expand all
156 // PluginList to use for testing. If this is NULL, defaults to the global 163 // PluginList to use for testing. If this is NULL, defaults to the global
157 // singleton. 164 // singleton.
158 webkit::npapi::PluginList* plugin_list_; 165 webkit::npapi::PluginList* plugin_list_;
159 166
160 PrefChangeRegistrar registrar_; 167 PrefChangeRegistrar registrar_;
161 168
162 DISALLOW_COPY_AND_ASSIGN(PluginPrefs); 169 DISALLOW_COPY_AND_ASSIGN(PluginPrefs);
163 }; 170 };
164 171
165 #endif // CHROME_BROWSER_PLUGIN_PREFS_H_ 172 #endif // CHROME_BROWSER_PLUGIN_PREFS_H_
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/plugin_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698