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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/resolve_conflicts_command.cc

Issue 10559104: sync: Process 'control' data separately (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update patch. Still draft quality. Created 8 years, 6 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
« sync/engine/apply_updates_command.cc ('K') | « sync/engine/conflict_resolver.cc ('k') | sync/engine/syncer.cc » ('j') | sync/engine/syncer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/resolve_conflicts_command.cc
diff --git a/sync/engine/resolve_conflicts_command.cc b/sync/engine/resolve_conflicts_command.cc
index bac365fea84ecd6c441571708e6fd2a2b893a3ed..2b4302f6dfc7d97d5d8400a5e784166aa93de04c 100644
--- a/sync/engine/resolve_conflicts_command.cc
+++ b/sync/engine/resolve_conflicts_command.cc
@@ -17,7 +17,13 @@ ResolveConflictsCommand::~ResolveConflictsCommand() {}
std::set<ModelSafeGroup> ResolveConflictsCommand::GetGroupsToChange(
const sessions::SyncSession& session) const {
- return session.GetEnabledGroupsWithConflicts();
+ std::set<ModelSafeGroup> groups_with_conflicts =
+ session.GetEnabledGroupsWithConflicts();
+
+ // GROUP_INTERNAL conflicts are not handled by this command.
+ groups_with_conflicts.erase(GROUP_INTERNAL);
+
+ return groups_with_conflicts;
}
SyncerError ResolveConflictsCommand::ModelChangingExecuteImpl(
« sync/engine/apply_updates_command.cc ('K') | « sync/engine/conflict_resolver.cc ('k') | sync/engine/syncer.cc » ('j') | sync/engine/syncer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698