chrome/browser/sync/engine/resolve_conflicts_command.h - 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/resolve_conflicts_command.h

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:

Index: chrome/browser/sync/engine/resolve_conflicts_command.h

diff --git a/chrome/browser/sync/engine/resolve_conflicts_command.h b/chrome/browser/sync/engine/resolve_conflicts_command.h

index 24075938630e7576ea56d92f816d6b331269d87c..3d7a58fe365343aecf15c30da3352894c8f0365d 100644

--- a/chrome/browser/sync/engine/resolve_conflicts_command.h

+++ b/chrome/browser/sync/engine/resolve_conflicts_command.h

@@ -21,7 +21,7 @@ class ResolveConflictsCommand : public ModelChangingSyncerCommand {

// ModelChangingSyncerCommand implementation.

virtual std::set<ModelSafeGroup> GetGroupsToChange(

const sessions::SyncSession& session) const OVERRIDE;

- virtual void ModelChangingExecuteImpl(

+ virtual SyncerError ModelChangingExecuteImpl(

sessions::SyncSession* session) OVERRIDE;

private: