chrome/browser/sync/engine/build_and_process_conflict_sets_command.h - Issue 2828021: Take 2: sync changes to support encryption

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 2828021: Take 2: sync changes to support encryption (Closed)

Patch Set: fix flaky password test under valgrind Created 10 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:

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

Download patch

« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command_unittest.cc ('k') | chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

index 00cca6d399f6744bd3475c23a9d51eaa7b9d3184..e2edb22c20ce322a3538b3880e7c540c3e2e5dc8 100644

--- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

+++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.h

@@ -22,6 +22,7 @@ class WriteTransaction;

namespace browser_sync {

class ConflictResolver;

+class Cryptographer;

namespace sessions {

class ConflictProgress;

@@ -41,11 +42,13 @@ class BuildAndProcessConflictSetsCommand : public ModelChangingSyncerCommand {

bool ProcessSingleDirectionConflictSets(

syncable::WriteTransaction* trans, ConflictResolver* resolver,

- sessions::StatusController* status, const ModelSafeRoutingInfo& routes);

+ Cryptographer* cryptographer, sessions::StatusController* status,

+ const ModelSafeRoutingInfo& routes);

bool ApplyUpdatesTransactionally(

syncable::WriteTransaction* trans,

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

ConflictResolver* resolver,

+ Cryptographer* cryptographer,

const ModelSafeRoutingInfo& routes,

sessions::StatusController* status);

void BuildConflictSets(syncable::BaseTransaction* trans,