diff options
author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-05 01:23:44 +0000 |
---|---|---|
committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-05 01:23:44 +0000 |
commit | 47217cf0e17aa7aa5da0401bd5ea17203da4aed7 (patch) | |
tree | 3d9720e09cb0eacc8a5a0d59c26f3123ffc57ba2 /chrome/browser/plugin_prefs.cc | |
parent | 5a5fdc08c1ae8fdfce391f1a17c5fbb6097ab280 (diff) | |
download | chromium_src-47217cf0e17aa7aa5da0401bd5ea17203da4aed7.zip chromium_src-47217cf0e17aa7aa5da0401bd5ea17203da4aed7.tar.gz chromium_src-47217cf0e17aa7aa5da0401bd5ea17203da4aed7.tar.bz2 |
Revert r108744, r108753 - "Modify code in chrome to call wrapper functions on PluginService"
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8475020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_prefs.cc')
-rw-r--r-- | chrome/browser/plugin_prefs.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc index 340be8b..c20886e 100644 --- a/chrome/browser/plugin_prefs.cc +++ b/chrome/browser/plugin_prefs.cc @@ -480,7 +480,7 @@ void PluginPrefs::SetPolicyEnforcedPluginPatterns( webkit::npapi::PluginList* PluginPrefs::GetPluginList() { if (plugin_list_) return plugin_list_; - return PluginService::GetInstance()->GetPluginList(); + return webkit::npapi::PluginList::Singleton(); } void PluginPrefs::GetPreferencesDataOnFileThread() { |