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

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: Update gypi 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
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 bd343fc09d3c128f9671ccf4b788385e900519c9..4e0428c8fe079fa4f4876cfe93fc0c6ea616f0a0 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
@@ -428,15 +428,12 @@ 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 (profile_->GetPrefs()->GetBoolean(
prefs::kInvalidationServiceUseGCMChannel) &&
gcm::GCMProfileService::GetGCMEnabledState(profile_) ==
gcm::GCMProfileService::ALWAYS_ENABLED) {
network_channel_type = GCM_NETWORK_CHANNEL;
}
-#endif
if (network_channel_type_ == network_channel_type)
return;
network_channel_type_ = network_channel_type;

Powered by Google App Engine
This is Rietveld 408576698