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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 184273011: Merge 253787 "[GCM] Make sure GCM checkout logic is invoked when..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: Created 6 years, 10 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/sync/profile_sync_service.cc
===================================================================
--- chrome/browser/sync/profile_sync_service.cc (revision 255183)
+++ chrome/browser/sync/profile_sync_service.cc (working copy)
@@ -1082,6 +1082,8 @@
experiments.gcm_channel_state ==
syncer::Experiments::ENABLED);
gcm::GCMProfileServiceFactory::GetForProfile(profile());
+ } else {
+ profile()->GetPrefs()->ClearPref(prefs::kGCMChannelEnabled);
}
if (experiments.enhanced_bookmarks_enabled) {
« no previous file with comments | « chrome/browser/services/gcm/gcm_profile_service_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698