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

Unified Diff: chrome/browser/plugins/plugin_prefs.h

Issue 19518006: Remove the two years old code to enable the nacl plugin once if it's disabled. This was added to de… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/plugins/plugin_prefs.cc » ('j') | content/browser/plugin_loader_posix.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_prefs.h
===================================================================
--- chrome/browser/plugins/plugin_prefs.h (revision 212045)
+++ chrome/browser/plugins/plugin_prefs.h (working copy)
@@ -25,10 +25,7 @@
namespace webkit {
struct WebPluginInfo;
-namespace npapi {
-class PluginList;
}
-}
// This class stores information about whether a plug-in or a plug-in group is
// enabled or disabled.
@@ -49,9 +46,6 @@
// created PluginPrefs object.
static scoped_refptr<PluginPrefs> GetForTestingProfile(Profile* profile);
- // Sets the plug-in list for tests.
- void SetPluginListForTesting(webkit::npapi::PluginList* plugin_list);
-
// Creates a new instance. This method should only be used for testing.
PluginPrefs();
@@ -119,9 +113,6 @@
const std::set<string16>& disabled_exception_patterns,
const std::set<string16>& enabled_patterns);
- // Returns the plugin list to use, either the singleton or the override.
- webkit::npapi::PluginList* GetPluginList() const;
-
// Callback for after the plugin groups have been loaded.
void EnablePluginGroupInternal(
bool enabled,
@@ -134,10 +125,6 @@
const base::Callback<void(bool)>& callback,
const std::vector<webkit::WebPluginInfo>& plugins);
- // Called on the file thread to get the data necessary to update the saved
- // preferences.
- void GetPreferencesDataOnFileThread();
-
// Called on the UI thread with the plugin data to save the preferences.
void OnUpdatePreferences(const std::vector<webkit::WebPluginInfo>& plugins);
@@ -167,10 +154,6 @@
// Weak pointer, owned by the profile.
PrefService* prefs_;
- // PluginList to use for testing. If this is NULL, defaults to the global
- // singleton.
- webkit::npapi::PluginList* plugin_list_;
-
PrefChangeRegistrar registrar_;
DISALLOW_COPY_AND_ASSIGN(PluginPrefs);
« no previous file with comments | « no previous file | chrome/browser/plugins/plugin_prefs.cc » ('j') | content/browser/plugin_loader_posix.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698