| Index: chrome/browser/content_settings/content_settings_internal_extension_provider.h
|
| diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.h b/chrome/browser/content_settings/content_settings_internal_extension_provider.h
|
| index ae8ba2883b395a13d4c53b171dcf8108e7d279c7..2078f4eed09d2bee2a3a2f29cbe586336123c18c 100644
|
| --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.h
|
| +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.h
|
| @@ -12,21 +12,18 @@
|
| #include "components/content_settings/core/common/content_settings.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| -#include "extensions/browser/extension_registry_observer.h"
|
|
|
| class ExtensionService;
|
|
|
| namespace extensions {
|
| class Extension;
|
| -class ExtensionRegistry;
|
| }
|
|
|
| namespace content_settings {
|
|
|
| // A content settings provider which disables certain plugins for platform apps.
|
| class InternalExtensionProvider : public ObservableProvider,
|
| - public content::NotificationObserver,
|
| - public extensions::ExtensionRegistryObserver {
|
| + public content::NotificationObserver {
|
| public:
|
| explicit InternalExtensionProvider(ExtensionService* extension_service);
|
|
|
| @@ -54,16 +51,6 @@
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
| -
|
| - // extensions::ExtensionRegistryObserver implementation.
|
| - virtual void OnExtensionLoaded(
|
| - content::BrowserContext* browser_context,
|
| - const extensions::Extension* extension) OVERRIDE;
|
| - virtual void OnExtensionUnloaded(
|
| - content::BrowserContext* browser_context,
|
| - const extensions::Extension* extension,
|
| - extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
|
| -
|
| private:
|
| void SetContentSettingForExtension(const extensions::Extension* extension,
|
| ContentSetting setting);
|
| @@ -78,8 +65,6 @@
|
| mutable base::Lock lock_;
|
| scoped_ptr<content::NotificationRegistrar> registrar_;
|
|
|
| - extensions::ExtensionRegistry* extension_registry_; // Not owned.
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(InternalExtensionProvider);
|
| };
|
|
|
|
|