chrome/browser/sync/engine/syncer_util.h - Issue 351026: Remove context-based dependencies on SyncerSession from ApplyUpdatesCommand....

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

Issue 351026: Remove context-based dependencies on SyncerSession from ApplyUpdatesCommand.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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

===================================================================

--- chrome/browser/sync/engine/syncer_util.h (revision 30625)

+++ chrome/browser/sync/engine/syncer_util.h (working copy)

@@ -22,7 +22,6 @@

namespace browser_sync {

-class SyncerSession;

class SyncEntity;

class SyncerUtil {

@@ -55,12 +54,12 @@

static UpdateAttemptResponse AttemptToUpdateEntry(

syncable::WriteTransaction* const trans,

syncable::MutableEntry* const entry,

- SyncerSession* const session);

+ ConflictResolver* resolver);

static UpdateAttemptResponse AttemptToUpdateEntryWithoutMerge(

syncable::WriteTransaction* const trans,

syncable::MutableEntry* const entry,

- SyncerSession* const session, syncable::Id* const conflicting_id);

+ syncable::Id* const conflicting_id);

// Pass in name to avoid redundant UTF8 conversion.

static void UpdateServerFieldsFromUpdate(

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