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

Unified Diff: chrome/browser/plugin_prefs.cc

Issue 8071013: Finish moving plugin probing out of process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review Created 9 years, 2 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
Index: chrome/browser/plugin_prefs.cc
diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc
index dd7df3432a1baff3f969e7bf675c092f0d8562ad..a363e08f390f1b22e373ad787c73df56ffb2d9d5 100644
--- a/chrome/browser/plugin_prefs.cc
+++ b/chrome/browser/plugin_prefs.cc
@@ -31,6 +31,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"
@@ -155,7 +156,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);

Powered by Google App Engine
This is Rietveld 408576698