chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc - Issue 9036003: Avoid useless SYNC_CYCLE_CONTINUATION sync cycle

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

Issue 9036003: Avoid useless SYNC_CYCLE_CONTINUATION sync cycle (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years 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 | « chrome/browser/sync/engine/build_and_process_conflict_sets_command.h ('k') | chrome/browser/sync/engine/build_commit_command.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

index 065f021af8efe36e8ad9135c703fd2ef246122bd..1fbaa25ed2b41b4d2037219f7bf09a5a0317fa32 100644

--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc

@@ -35,10 +35,11 @@ std::set<ModelSafeGroup> BuildAndProcessConflictSetsCommand::GetGroupsToChange(

return session.GetEnabledGroupsWithConflicts();

}

-void BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl(

+SyncerError BuildAndProcessConflictSetsCommand::ModelChangingExecuteImpl(

SyncSession* session) {

session->mutable_status_controller()->update_conflict_sets_built(

BuildAndProcessConflictSets(session));

+ return NO_ERROR;

}

bool BuildAndProcessConflictSetsCommand::BuildAndProcessConflictSets(