chrome/browser/sync/engine/build_and_process_conflict_sets_command.h - Issue 211019: Fix compiling of sync on linux.

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

Issue 211019: Fix compiling of sync on linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 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: chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

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

--- chrome/browser/sync/engine/build_and_process_conflict_sets_command.h (revision 26817)

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

@@ -39,9 +39,8 @@

syncable::WriteTransaction* trans,

const std::vector<syncable::Id>* const update_set,

SyncerSession* const session);

- void BuildAndProcessConflictSetsCommand::BuildConflictSets(

- syncable::BaseTransaction* trans,

- ConflictResolutionView* view);

+ void BuildConflictSets(syncable::BaseTransaction* trans,

+ ConflictResolutionView* view);

void MergeSetsForNameClash(syncable::BaseTransaction* trans,

syncable::Entry* entry,