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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 7387010: Add PluginServiceFilter interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 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
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 336e6585f476931526a4ea11879190ddf7e0b4d0..56667cb45c853bf7f8d1960991ca16d7c6466bb6 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -24,6 +24,7 @@
#include "base/values.h"
#include "base/version.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_plugin_service_helper.h"
#include "chrome/browser/extensions/apps_promo.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_accessibility_api.h"
@@ -1419,7 +1420,7 @@ void ExtensionService::NotifyExtensionLoaded(const Extension* extension) {
webkit::npapi::PluginList::Singleton()->AddExtraPluginPath(plugin.path);
plugins_changed = true;
if (!plugin.is_public) {
- PluginService::GetInstance()->RestrictPluginToUrl(
+ ChromePluginServiceHelper::GetInstance()->RestrictPluginToUrl(
plugin.path, extension->url());
}
}
@@ -1503,8 +1504,10 @@ void ExtensionService::NotifyExtensionUnloaded(
webkit::npapi::PluginList::Singleton()->RemoveExtraPluginPath(
plugin.path);
plugins_changed = true;
- if (!plugin.is_public)
- PluginService::GetInstance()->RestrictPluginToUrl(plugin.path, GURL());
+ if (!plugin.is_public) {
+ ChromePluginServiceHelper::GetInstance()->RestrictPluginToUrl(
+ plugin.path, GURL());
+ }
}
bool nacl_modules_changed = false;

Powered by Google App Engine
This is Rietveld 408576698