sync/engine/syncer.h - Issue 11192071: sync: Merge apply updates and resolve conflicts

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

Issue 11192071: sync: Merge apply updates and resolve conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Retry (base files were missing) Created 8 years, 2 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: sync/engine/syncer.h

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

index 3c4c68ecaef9d94f867102c5f5cc43d283f3bf49..ee97b08c438e87cbdff8712f3010ef5375f4a571 100644

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

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

@@ -31,8 +31,6 @@ enum SyncerStep {

STORE_TIMESTAMPS,

APPLY_UPDATES,

COMMIT,

- RESOLVE_CONFLICTS,

- APPLY_UPDATES_TO_RESOLVE_CONFLICTS,

SYNCER_END

};

« no previous file with comments | « sync/engine/sync_scheduler_unittest.cc ('k') | sync/engine/syncer.cc » ('j') | no next file with comments »