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

Unified Diff: chrome/browser/sync/glue/data_type_manager_impl.cc

Issue 19227004: [Sync] Add CoreTypes support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add Core types and update tests Created 7 years, 5 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/glue/data_type_manager_impl.cc
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc
index 87daedb47c9aa997169c3e5f450d340c310f5da9..ecf54c64160228ea4058ae886f441fd97b4a4ab6 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
@@ -78,9 +78,8 @@ DataTypeManagerImpl::~DataTypeManagerImpl() {}
void DataTypeManagerImpl::Configure(syncer::ModelTypeSet desired_types,
syncer::ConfigureReason reason) {
desired_types.PutAll(syncer::ControlTypes());
- // The list of managed users created by this profile is always synced,
- // but they are not a control type.
- desired_types.Put(syncer::MANAGED_USERS);
+ desired_types.PutAll(syncer::CoreTypes());
+ desired_types.PutAll(syncer::PriorityCoreTypes());
ConfigureImpl(desired_types, reason);
}
@@ -243,6 +242,7 @@ void DataTypeManagerImpl::Restart(syncer::ConfigureReason reason) {
syncer::ModelTypeSet DataTypeManagerImpl::GetPriorityTypes() const {
syncer::ModelTypeSet high_priority_types;
high_priority_types.PutAll(syncer::ControlTypes());
+ high_priority_types.PutAll(syncer::PriorityCoreTypes());
high_priority_types.PutAll(syncer::PriorityUserTypes());
return high_priority_types;
}

Powered by Google App Engine
This is Rietveld 408576698