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

Unified Diff: chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h

Issue 244473002: Remove NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED from c/b/e/api (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: feedback Created 6 years, 8 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/api/settings_overrides/settings_overrides_api.h
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
index 37036099dd992b3a73202335ce0d733500078e3a..eebd4d662cbc49aa2a84d8364f5f6d7036cf245d 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h
@@ -8,18 +8,18 @@
#include <set>
#include <string>
-#include "base/basictypes.h"
+#include "base/scoped_observer.h"
#include "chrome/browser/search_engines/template_url_service.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
#include "extensions/browser/browser_context_keyed_api_factory.h"
+#include "extensions/browser/extension_registry_observer.h"
class TemplateURL;
namespace extensions {
+class ExtensionRegistry;
class SettingsOverridesAPI : public BrowserContextKeyedAPI,
- public content::NotificationObserver {
+ public ExtensionRegistryObserver {
public:
explicit SettingsOverridesAPI(content::BrowserContext* context);
virtual ~SettingsOverridesAPI();
@@ -39,10 +39,15 @@ class SettingsOverridesAPI : public BrowserContextKeyedAPI,
base::Value* value);
void UnsetPref(const std::string& extension_id,
const std::string& pref_key);
- // content::NotificationObserver implementation.
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
+
+ // ExtensionRegistryObserver implementation.
+ virtual void OnExtensionLoaded(content::BrowserContext* browser_context,
+ const Extension* extension) OVERRIDE;
+ virtual void OnExtensionUnloaded(
+ content::BrowserContext* browser_context,
+ const Extension* extension,
+ UnloadedExtensionInfo::Reason reason) OVERRIDE;
+
// KeyedService implementation.
virtual void Shutdown() OVERRIDE;
@@ -59,7 +64,10 @@ class SettingsOverridesAPI : public BrowserContextKeyedAPI,
// have search provider registered.
PendingExtensions pending_extensions_;
- content::NotificationRegistrar registrar_;
+ // Listen to extension load, unloaded notifications.
+ ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
+ extension_registry_observer_;
+
scoped_ptr<TemplateURLService::Subscription> template_url_sub_;
DISALLOW_COPY_AND_ASSIGN(SettingsOverridesAPI);

Powered by Google App Engine
This is Rietveld 408576698