GCM: D-Bus methods for wake-on-packet

chrome/browser/services/gcm/chromeos_gcm_app_handler.h

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 62%
copy from components/gcm_driver/default_gcm_app_handler.h
copy to chrome/browser/services/gcm/chromeos_gcm_app_handler.h
index 5a1b0a2d10346183d4816b75fa094a68eb40614a..193f3896325d7eca8b423f507b306caada6ef2b5 100644
--- a/components/gcm_driver/default_gcm_app_handler.h
+++ b/chrome/browser/services/gcm/chromeos_gcm_app_handler.h
@@ -2,38 +2,45 @@
 // 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 {

[fgorski, 2014/09/05 18:17:31]

should be:
class ChromeOSGCMConnectionObserver : public GCMConnectionObserver

This will make that part much smaller and allow it to apply.

You no longer need to inherit from 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 OnSendAcknowledged(const std::string& app_id,
-                                  const std::string& message_id) OVERRIDE;
+                                  const std::string& message_id) 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_