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

Unified Diff: chrome/browser/services/gcm/gcm_profile_service.cc

Issue 597683005: GCM: D-Bus methods for wake-on-packet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved DEPS conflict Created 6 years, 3 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: chrome/browser/services/gcm/gcm_profile_service.cc
diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc
index 0223cbeef2b1e2e72ffe9dce4f48c987ce5821b8..0de6385d77b6fe0d6f1fa820c404316e224569b5 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc
@@ -16,6 +16,9 @@
#include "components/gcm_driver/gcm_driver_android.h"
#else
#include "base/bind.h"
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/services/gcm/chromeos_gcm_connection_observer.h"
+#endif
#include "base/files/file_path.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/services/gcm/gcm_account_tracker.h"
@@ -170,6 +173,11 @@ GCMProfileService::GCMProfileService(
profile_->GetPath().Append(chrome::kGCMStoreDirname),
profile_->GetRequestContext());
+#if defined(OS_CHROMEOS)
+ chromeos_connection_observer_.reset(new gcm::ChromeOSGCMConnectionObserver);
+ driver_->AddConnectionObserver(chromeos_connection_observer_.get());
+#endif
+
identity_observer_.reset(new IdentityObserver(
profile, static_cast<gcm::GCMDriverDesktop*>(driver_.get())));
}
@@ -205,8 +213,11 @@ void GCMProfileService::Shutdown() {
#if !defined(OS_ANDROID)
identity_observer_.reset();
#endif // !defined(OS_ANDROID)
-
if (driver_) {
+#if defined(OS_CHROMEOS)
+ driver_->RemoveConnectionObserver(chromeos_connection_observer_.get());
+ chromeos_connection_observer_.reset();
+#endif
driver_->Shutdown();
driver_.reset();
}
« no previous file with comments | « chrome/browser/services/gcm/gcm_profile_service.h ('k') | chrome/browser/services/gcm/gcm_profile_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698