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

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

Issue 722043004: Clean up wake on wifi handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 1 month 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
« no previous file with comments | « chrome/browser/services/gcm/gcm_profile_service.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 018cbe6037ab0f223e1ba3fb8e3278963b96ba9e..0b898ab6881e848b08d5e77a9f68b40da2ae1a4f 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc
@@ -17,9 +17,6 @@
#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"
@@ -166,11 +163,6 @@ 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, driver_.get()));
}
#endif // defined(OS_ANDROID)
@@ -188,10 +180,6 @@ void GCMProfileService::Shutdown() {
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/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698