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

Unified Diff: components/invalidation/gcm_invalidation_bridge.h

Issue 515763002: [GCM] Extracting GCMConnectionObserver from GCMAppHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing CR feedback Created 6 years, 4 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: components/invalidation/gcm_invalidation_bridge.h
diff --git a/components/invalidation/gcm_invalidation_bridge.h b/components/invalidation/gcm_invalidation_bridge.h
index 38f12a6926cf6efa55f3f9c21e8b03cfdab44288..7f519270d838d80017d8c6d8f21e9b7a24ff1276 100644
--- a/components/invalidation/gcm_invalidation_bridge.h
+++ b/components/invalidation/gcm_invalidation_bridge.h
@@ -11,6 +11,7 @@
#include "base/threading/non_thread_safe.h"
#include "components/gcm_driver/gcm_app_handler.h"
#include "components/gcm_driver/gcm_client.h"
+#include "components/gcm_driver/gcm_connection_observer.h"
#include "components/invalidation/gcm_network_channel_delegate.h"
#include "google_apis/gaia/oauth2_token_service.h"
@@ -32,6 +33,7 @@ namespace invalidation {
// all function calls to GCMInvalidationBridge which does actual work to perform
// them.
class GCMInvalidationBridge : public gcm::GCMAppHandler,
+ public gcm::GCMConnectionObserver,
public OAuth2TokenService::Consumer,
public base::NonThreadSafe {
public:
@@ -59,6 +61,8 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
virtual void OnSendAcknowledged(const std::string& app_id,
const std::string& message_id) OVERRIDE;
+
+ // gcm::GCMConnectionObserver implementation.
virtual void OnConnected(const net::IPEndPoint& ip_endpoint) OVERRIDE;
virtual void OnDisconnected() OVERRIDE;
« no previous file with comments | « components/gcm_driver/gcm_driver_desktop_unittest.cc ('k') | components/invalidation/gcm_invalidation_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698