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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10832286: sync: Introduce control data types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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
« chrome/browser/sync/glue/data_type_manager_impl.h ('K') | « chrome/browser/sync/glue/data_type_manager_impl.h ('k') | chrome/browser/sync/glue/data_type_manager_impl_unittest.cc » ('j') | chrome/browser/sync/glue/data_type_manager_impl_unittest.cc » ('J')
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 7721c4748bb1ea918503b5d7767c5812d665ff77..97c8afae17b8374835e8a569879f25bd334c10b2 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
@@ -50,11 +50,11 @@ void DataTypeManagerImpl::Configure(TypeSet desired_types,
ConfigureImpl(desired_types, reason);
}
-void DataTypeManagerImpl::ConfigureWithoutNigori(
- TypeSet desired_types,
+void DataTypeManagerImpl::Purge(
+ TypeSet undesired_types,
syncer::ConfigureReason reason) {
- DCHECK(!desired_types.Has(syncer::NIGORI));
- ConfigureImpl(desired_types, reason);
+ TypeSet remainder = Difference(last_requested_types_, undesired_types);
+ ConfigureImpl(remainder, reason);
}
void DataTypeManagerImpl::ConfigureImpl(
« chrome/browser/sync/glue/data_type_manager_impl.h ('K') | « chrome/browser/sync/glue/data_type_manager_impl.h ('k') | chrome/browser/sync/glue/data_type_manager_impl_unittest.cc » ('j') | chrome/browser/sync/glue/data_type_manager_impl_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698