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

Unified Diff: sync/internal_api/sync_manager_impl.cc

Issue 11958029: [Sync] Add support for proxy types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix more tests 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: sync/internal_api/sync_manager_impl.cc
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 874444ba1b552a8ddff4779b8f9cb8734e4c1799..e9a7f1a45810911acf5c23454584d778e922caa0 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -571,6 +571,7 @@ bool SyncManagerImpl::PurgePartiallySyncedTypes() {
partially_synced_types.RemoveAll(InitialSyncEndedTypes());
partially_synced_types.RemoveAll(GetTypesWithEmptyProgressMarkerToken(
ModelTypeSet::All()));
+ partially_synced_types.RemoveAll(LocalTypes());
DVLOG(1) << "Purging partially synced types "
<< ModelTypeSetToString(partially_synced_types);
@@ -586,6 +587,7 @@ bool SyncManagerImpl::PurgeDisabledTypes(
ModelTypeSet currently_enabled_types) {
ModelTypeSet disabled_types = Difference(previously_enabled_types,
currently_enabled_types);
+ disabled_types.RemoveAll(LocalTypes());
if (disabled_types.Empty())
return true;

Powered by Google App Engine
This is Rietveld 408576698