sync/engine/syncer_util.cc - Issue 10933075: FYI: Remove PerModelSafeGroupState + move ConflictResolution

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_util.cc

Issue 10933075: FYI: Remove PerModelSafeGroupState + move ConflictResolution (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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_util.cc

diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc

index 85e1ff5815e59612792f987fbc9ac9f59fc45ae7..0dad3f8c367c9aa240ced2b0a48ffd0b345da7c1 100644

--- a/sync/engine/syncer_util.cc

+++ b/sync/engine/syncer_util.cc

@@ -184,7 +184,6 @@ syncable::Id FindLocalIdToUpdate(

UpdateAttemptResponse AttemptToUpdateEntry(

syncable::WriteTransaction* const trans,

syncable::MutableEntry* const entry,

- ConflictResolver* resolver,

Cryptographer* cryptographer) {

CHECK(entry->good());

if (!entry->Get(IS_UNAPPLIED_UPDATE))

« no previous file with comments | « sync/engine/syncer_util.h ('k') | sync/engine/update_applicator.h » ('j') | no next file with comments »