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

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

Issue 11961030: [Sync] Make SESSIONS an implicit type (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 years, 11 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
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 7296d00c7ff17ba0d91004e69474f95af49f720a..2ea0a5409e9ecac37ac6f50d86613b7fdf216802 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1288,7 +1288,7 @@ void ProfileSyncService::UpdateSelectedTypesHistogram(
syncer::EXTENSIONS,
syncer::PASSWORDS,
syncer::PREFERENCES,
- syncer::SESSIONS,
+ syncer::TABS,
syncer::SYNCED_NOTIFICATIONS,
syncer::THEMES,
syncer::TYPED_URLS
@@ -1302,13 +1302,13 @@ void ProfileSyncService::UpdateSelectedTypesHistogram(
browser_sync::user_selectable_type::EXTENSIONS,
browser_sync::user_selectable_type::PASSWORDS,
browser_sync::user_selectable_type::PREFERENCES,
- browser_sync::user_selectable_type::SESSIONS,
+ browser_sync::user_selectable_type::TABS,
browser_sync::user_selectable_type::SYNCED_NOTIFICATIONS,
browser_sync::user_selectable_type::THEMES,
browser_sync::user_selectable_type::TYPED_URLS
};
- COMPILE_ASSERT(22 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);
+ COMPILE_ASSERT(23 == syncer::MODEL_TYPE_COUNT, UpdateCustomConfigHistogram);
COMPILE_ASSERT(arraysize(model_types) ==
browser_sync::user_selectable_type::SELECTABLE_DATATYPE_COUNT,
UpdateCustomConfigHistogram);
@@ -1348,7 +1348,8 @@ void ProfileSyncService::RefreshSpareBootstrapToken(
}
#endif
-void ProfileSyncService::OnUserChoseDatatypes(bool sync_everything,
+void ProfileSyncService::OnUserChoseDatatypes(
+ bool sync_everything,
syncer::ModelTypeSet chosen_types) {
if (!backend_.get() && !HasUnrecoverableError()) {
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698