sync/engine/conflict_resolver.h - Issue 10559104: sync: Process 'control' data separately

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

Issue 10559104: sync: Process 'control' data separately (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rename, cleanup, fix tests 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:

Index: sync/engine/conflict_resolver.h

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

index fedaa45804ca03521bc4bdb44a687a1d5c666e78..45f90e044ae2d5ac70d2fc72a722abd576268ca3 100644

--- a/sync/engine/conflict_resolver.h

+++ b/sync/engine/conflict_resolver.h

@@ -66,10 +66,6 @@ class ConflictResolver {

SYNC_PROGRESS, // Progress made.

};

- void IgnoreLocalChanges(syncable::MutableEntry* entry);

- void OverwriteServerChanges(syncable::WriteTransaction* trans,

- syncable::MutableEntry* entry);

ProcessSimpleConflictResult ProcessSimpleConflict(

syncable::WriteTransaction* trans,

const syncable::Id& id,

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