diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 14:00:43 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 14:00:43 +0000 |
| commit | 88ca491d78b19e7b681943216483710322985fc5 (patch) | |
| tree | e1fe0286f7afff7c402db198ddc1c0b252c14079 /chrome/browser/plugin_prefs.cc | |
| parent | 588be018436093781847593513ec1e5875a532db (diff) | |
| download | chromium_src-88ca491d78b19e7b681943216483710322985fc5.zip chromium_src-88ca491d78b19e7b681943216483710322985fc5.tar.gz chromium_src-88ca491d78b19e7b681943216483710322985fc5.tar.bz2 | |
Finish moving plugin probing out of process.
This moves all browser-side synchronous callers to use the asynchronous
PluginService interface.
BUG=17863,95114
TEST=Covered by tests. Plugins still work.
Review URL: http://codereview.chromium.org/8071013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_prefs.cc')
| -rw-r--r-- | chrome/browser/plugin_prefs.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc index 7ddf824..7e523b5 100644 --- a/chrome/browser/plugin_prefs.cc +++ b/chrome/browser/plugin_prefs.cc @@ -29,6 +29,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" +#include "content/browser/plugin_service.h" #include "content/common/notification_service.h" #include "webkit/plugins/npapi/plugin_group.h" #include "webkit/plugins/npapi/plugin_list.h" @@ -107,7 +108,7 @@ bool PluginPrefs::EnablePlugin(bool enabled, const FilePath& path) { // Do policy checks first. These don't need to run on the FILE thread. webkit::npapi::PluginList* plugin_list = GetPluginList(); webkit::WebPluginInfo plugin; - if (plugin_list->GetPluginInfoByPath(path, &plugin)) { + if (PluginService::GetInstance()->GetPluginInfoByPath(path, &plugin)) { scoped_ptr<webkit::npapi::PluginGroup> group( plugin_list->GetPluginGroup(plugin)); PolicyStatus plugin_status = PolicyStatusForPlugin(plugin.name); |