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

Unified Diff: chrome/browser/invalidation/ticl_invalidation_service.cc

Issue 211973003: [GCM] Cleanup for ios enabling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 9 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
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/invalidation/ticl_invalidation_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/invalidation/ticl_invalidation_service.cc
diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc
index 3539110c7a340e64f4ee086ebeefd5d746119225..eb5f33062e46908c215ca41683b8418fb9f07c52 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
@@ -429,8 +429,6 @@ void TiclInvalidationService::StartInvalidator(
void TiclInvalidationService::UpdateInvalidationNetworkChannel() {
InvalidationNetworkChannel network_channel_type = PUSH_CLIENT_CHANNEL;
-// For now don't use GCM on iOS.
-#if !defined(OS_IOS)
if (gcm::GCMProfileService::GetGCMEnabledState(profile_) ==
gcm::GCMProfileService::ALWAYS_ENABLED &&
(profile_->GetPrefs()->GetBoolean(
@@ -439,7 +437,6 @@ void TiclInvalidationService::UpdateInvalidationNetworkChannel() {
switches::kInvalidationUseGCMChannel))) {
network_channel_type = GCM_NETWORK_CHANNEL;
}
-#endif
if (network_channel_type_ == network_channel_type)
return;
network_channel_type_ = network_channel_type;
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/invalidation/ticl_invalidation_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698