| Index: chrome/browser/extensions/extension_gcm_app_handler.h
|
| diff --git a/chrome/browser/extensions/extension_gcm_app_handler.h b/chrome/browser/extensions/extension_gcm_app_handler.h
|
| index 1eb9aebc843c79367ddde8058f3c5d7adabdaaf5..3e2c00f00f67e1443df1d18e44c617c19a22a193 100644
|
| --- a/chrome/browser/extensions/extension_gcm_app_handler.h
|
| +++ b/chrome/browser/extensions/extension_gcm_app_handler.h
|
| @@ -39,23 +39,22 @@ class ExtensionGCMAppHandler : public gcm::GCMAppHandler,
|
| public ExtensionRegistryObserver {
|
| public:
|
| explicit ExtensionGCMAppHandler(content::BrowserContext* context);
|
| - virtual ~ExtensionGCMAppHandler();
|
| + ~ExtensionGCMAppHandler() override;
|
|
|
| // BrowserContextKeyedAPI implementation.
|
| static BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler>*
|
| GetFactoryInstance();
|
|
|
| // gcm::GCMAppHandler implementation.
|
| - virtual void ShutdownHandler() override;
|
| - virtual void OnMessage(
|
| - const std::string& app_id,
|
| - const gcm::GCMClient::IncomingMessage& message) override;
|
| - virtual void OnMessagesDeleted(const std::string& app_id) override;
|
| - virtual void OnSendError(
|
| + void ShutdownHandler() override;
|
| + void OnMessage(const std::string& app_id,
|
| + const gcm::GCMClient::IncomingMessage& message) override;
|
| + void OnMessagesDeleted(const std::string& app_id) override;
|
| + void OnSendError(
|
| const std::string& app_id,
|
| const gcm::GCMClient::SendErrorDetails& send_error_details) override;
|
| - virtual void OnSendAcknowledged(const std::string& app_id,
|
| - const std::string& message_id) override;
|
| + void OnSendAcknowledged(const std::string& app_id,
|
| + const std::string& message_id) override;
|
|
|
| protected:
|
| // Could be overridden by testing purpose.
|
| @@ -70,16 +69,14 @@ private:
|
| friend class BrowserContextKeyedAPIFactory<ExtensionGCMAppHandler>;
|
|
|
| // 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;
|
| - virtual void OnExtensionUninstalled(
|
| - content::BrowserContext* browser_context,
|
| - const Extension* extension,
|
| - extensions::UninstallReason reason) override;
|
| + void OnExtensionLoaded(content::BrowserContext* browser_context,
|
| + const Extension* extension) override;
|
| + void OnExtensionUnloaded(content::BrowserContext* browser_context,
|
| + const Extension* extension,
|
| + UnloadedExtensionInfo::Reason reason) override;
|
| + void OnExtensionUninstalled(content::BrowserContext* browser_context,
|
| + const Extension* extension,
|
| + extensions::UninstallReason reason) override;
|
|
|
| void AddDummyAppHandler();
|
| void RemoveDummyAppHandler();
|
|
|