diff options
author | limasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 14:59:41 +0000 |
---|---|---|
committer | limasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 14:59:41 +0000 |
commit | 488949b794e4c64b7d9651a9e56c220d39d1b362 (patch) | |
tree | c64488b04c9a21a670e18a9525062980cfa51814 /chrome/browser/extensions/extension_gcm_app_handler.h | |
parent | c89af88738877765f53b47967bdf8579890ba9ca (diff) | |
download | chromium_src-488949b794e4c64b7d9651a9e56c220d39d1b362.zip chromium_src-488949b794e4c64b7d9651a9e56c220d39d1b362.tar.gz chromium_src-488949b794e4c64b7d9651a9e56c220d39d1b362.tar.bz2 |
Use ExtensionRegistryObserver instead of deprecated extension notification from c/b/extension
alarm, commands, declartive, storage api and extension_gcm_app_handler.
Also, removed unwanted extension:: namespace prefix.
R=rdevlin.cronin@chromium.org
BUG=376293
Review URL: https://codereview.chromium.org/299393002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_gcm_app_handler.h')
-rw-r--r-- | chrome/browser/extensions/extension_gcm_app_handler.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.h b/chrome/browser/extensions/extension_gcm_app_handler.h index 5da91b7..8bff0a7 100644 --- a/chrome/browser/extensions/extension_gcm_app_handler.h +++ b/chrome/browser/extensions/extension_gcm_app_handler.h @@ -13,8 +13,6 @@ #include "base/memory/weak_ptr.h" #include "base/scoped_observer.h" #include "components/gcm_driver/gcm_app_handler.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" #include "google_apis/gcm/gcm_client.h" @@ -38,7 +36,6 @@ class GcmJsEventRouter; // Defines the interface to provide handling logic for a given app. class ExtensionGCMAppHandler : public gcm::GCMAppHandler, public BrowserContextKeyedAPI, - public content::NotificationObserver, public ExtensionRegistryObserver { public: explicit ExtensionGCMAppHandler(content::BrowserContext* context); @@ -65,11 +62,6 @@ class ExtensionGCMAppHandler : public gcm::GCMAppHandler, private: friend class BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler>; - // 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; @@ -77,6 +69,8 @@ class ExtensionGCMAppHandler : public gcm::GCMAppHandler, content::BrowserContext* browser_context, const Extension* extension, UnloadedExtensionInfo::Reason reason) OVERRIDE; + virtual void OnExtensionUninstalled(content::BrowserContext* browser_context, + const Extension* extension) OVERRIDE; gcm::GCMDriver* GetGCMDriver() const; @@ -85,7 +79,6 @@ class ExtensionGCMAppHandler : public gcm::GCMAppHandler, static const bool kServiceIsNULLWhileTesting = true; Profile* profile_; - content::NotificationRegistrar registrar_; // Listen to extension load, unloaded notifications. ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> |