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

Unified Diff: sync/engine/apply_updates_command.cc

Issue 10825137: FYI: Control Data + Per-Device Metadata (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add PER_USER_METADATA, refactor some encryption code 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
Index: sync/engine/apply_updates_command.cc
diff --git a/sync/engine/apply_updates_command.cc b/sync/engine/apply_updates_command.cc
index da8a1cc4c2e987d464445cfbef8bd63cd0be4513..ed3c048f139110f6cf29c23d69734646075aa854 100644
--- a/sync/engine/apply_updates_command.cc
+++ b/sync/engine/apply_updates_command.cc
@@ -32,10 +32,15 @@ std::set<ModelSafeGroup> ApplyUpdatesCommand::GetGroupsToChange(
for (FullModelTypeSet::Iterator it =
server_types_with_unapplied_updates.First(); it.Good(); it.Inc()) {
+ VLOG(2) << "TYPES: " << ModelTypeToString(it.Get());
groups_with_unapplied_updates.insert(
GetGroupForModelType(it.Get(), session.routing_info()));
}
+ // The INTERNAL types are special. They have their own update routines,
rlarocque 2012/08/11 01:31:52 s/INTERNAL/CONTROL
+ // ApplyUpdatesCommand should not process them.
+ groups_with_unapplied_updates.erase(GROUP_CONTROL);
+
return groups_with_unapplied_updates;
}

Powered by Google App Engine
This is Rietveld 408576698