| Index: chrome/browser/services/gcm/chromeos_gcm_app_handler.h
|
| diff --git a/components/gcm_driver/default_gcm_app_handler.h b/chrome/browser/services/gcm/chromeos_gcm_app_handler.h
|
| similarity index 59%
|
| copy from components/gcm_driver/default_gcm_app_handler.h
|
| copy to chrome/browser/services/gcm/chromeos_gcm_app_handler.h
|
| index 57613a54bada666684f9ac0c95a70b97c2fd295a..8b43766530189b918899d11cc6ec326dad4249fe 100644
|
| --- a/components/gcm_driver/default_gcm_app_handler.h
|
| +++ b/chrome/browser/services/gcm/chromeos_gcm_app_handler.h
|
| @@ -2,36 +2,43 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_
|
| -#define COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_
|
| +#ifndef CHROME_BROWSER_SERVICES_GCM_CHROMEOS_GCM_APP_HANDLER_H_
|
| +#define CHROME_BROWSER_SERVICES_GCM_CHROMEOS_GCM_APP_HANDLER_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "components/gcm_driver/gcm_app_handler.h"
|
| +#include "net/base/ip_endpoint.h"
|
| +
|
|
|
| namespace gcm {
|
|
|
| // The default app handler that is triggered when there is no registered app
|
| // handler for an application id.
|
| -class DefaultGCMAppHandler : public GCMAppHandler {
|
| +class ChromeOSGCMAppHandler : public GCMAppHandler {
|
| public:
|
| - DefaultGCMAppHandler();
|
| - virtual ~DefaultGCMAppHandler();
|
| -
|
| + ChromeOSGCMAppHandler();
|
| + virtual ~ChromeOSGCMAppHandler();
|
| // Overridden from GCMAppHandler:
|
| - virtual void ShutdownHandler() OVERRIDE;
|
| + virtual void ShutdownHandler() OVERRIDE {}
|
| virtual void OnMessage(const std::string& app_id,
|
| - const GCMClient::IncomingMessage& message) OVERRIDE;
|
| - virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE;
|
| + const GCMClient::IncomingMessage& message) OVERRIDE {}
|
| + virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE {}
|
| virtual void OnSendError(
|
| const std::string& app_id,
|
| - const GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
|
| + const GCMClient::SendErrorDetails& send_error_details) OVERRIDE {}
|
| virtual void OnConnected(const net::IPEndPoint& ip_endpoint) OVERRIDE;
|
| virtual void OnDisconnected() OVERRIDE;
|
|
|
| + static void ErrorCallback(
|
| + const std::string& error_name,
|
| + const std::string& error);
|
| +
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(DefaultGCMAppHandler);
|
| + net::IPEndPoint ip_endpoint_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ChromeOSGCMAppHandler);
|
| };
|
|
|
| } // namespace gcm
|
|
|
| -#endif // COMPONENTS_GCM_DRIVER_DEFAULT_GCM_APP_HANDLER_H_
|
| +#endif // CHROME_BROWSER_SERVICES_GCM_CHROMEOS_GCM_APP_HANDLER_H_
|
|
|