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

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

Issue 266883007: Add a reason for configuring DTM for backup/rollback. In backup/rollback, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dtm test Created 6 years, 7 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 | « no previous file | chrome/browser/sync/glue/data_type_manager_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3c14d48d94c3985167a9b5cf1eb29e31ba081767..391ccd4cb82f8387ef025cdf4bebf7f2b29ad325 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
@@ -77,7 +77,10 @@ DataTypeManagerImpl::~DataTypeManagerImpl() {}
void DataTypeManagerImpl::Configure(syncer::ModelTypeSet desired_types,
syncer::ConfigureReason reason) {
- desired_types.PutAll(syncer::CoreTypes());
+ if (reason == syncer::CONFIGURE_REASON_BACKUP_ROLLBACK)
+ desired_types.PutAll(syncer::ControlTypes());
+ else
+ desired_types.PutAll(syncer::CoreTypes());
// Only allow control types and types that have controllers.
syncer::ModelTypeSet filtered_desired_types;
« no previous file with comments | « no previous file | chrome/browser/sync/glue/data_type_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698