chrome/browser/sync/engine/syncer.h - Issue 9305001: sync: Remove the remaining conflict sets code

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/syncer.h

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Additional comments Created 8 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:

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

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

index 9a17025fcb93b9905e0ea95545547b5f19ed128e..b2b33967aab971c0e4149b26c0d3a80cca779a6a 100644

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

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

@@ -40,7 +40,6 @@ enum SyncerStep {

BUILD_COMMIT_REQUEST,

POST_COMMIT_MESSAGE,

PROCESS_COMMIT_RESPONSE,

- BUILD_AND_PROCESS_CONFLICT_SETS,

RESOLVE_CONFLICTS,

APPLY_UPDATES_TO_RESOLVE_CONFLICTS,

CLEAR_PRIVATE_DATA, // TODO(tim): Rename 'private' to 'user'.