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

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

Issue 1418573005: [invalidation] Componentize TiclProfileSettingsProvider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Maintain pref registration on Android Created 5 years, 2 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 | « chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc ('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/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 48369fa8d69c16b2c42e2707a6e02664e0909d39..0c7d3170541e58787c222336c6d6ba7d9357ccc1 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -43,10 +43,10 @@
#include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/autofill/core/common/autofill_pref_names.h"
#include "components/history/core/browser/typed_url_data_type_controller.h"
+#include "components/invalidation/impl/invalidation_prefs.h"
#include "components/invalidation/impl/profile_invalidation_provider.h"
#include "components/invalidation/public/invalidation_service.h"
#include "components/password_manager/core/browser/password_store.h"
@@ -1158,8 +1158,9 @@ void ProfileSyncService::OnExperimentsChanged(
current_experiments_ = experiments;
- profile()->GetPrefs()->SetBoolean(prefs::kInvalidationServiceUseGCMChannel,
- experiments.gcm_invalidations_enabled);
+ profile()->GetPrefs()->SetBoolean(
+ invalidation::prefs::kInvalidationServiceUseGCMChannel,
+ experiments.gcm_invalidations_enabled);
profile()->GetPrefs()->SetBoolean(
autofill::prefs::kAutofillWalletSyncExperimentEnabled,
experiments.wallet_sync_enabled);
« no previous file with comments | « chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698