sync/engine/process_updates_command.h - 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/process_updates_command.h

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

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

index 7604d11535e6dc0b2507419fffdcdebc0bc38f34..eecbc647cb6ec2e18f27e560de356440236c43a3 100644

--- a/sync/engine/process_updates_command.h

+++ b/sync/engine/process_updates_command.h

@@ -42,6 +42,11 @@ class ProcessUpdatesCommand : public ModelChangingSyncerCommand {

sessions::SyncSession* session) OVERRIDE;

private:

+ VerifyResult VerifyUpdate(

+ syncable::WriteTransaction* trans,

+ const sync_pb::SyncEntity& entry,

+ ModelTypeSet requested_types,

+ const ModelSafeRoutingInfo& routes);

ServerUpdateProcessingResult ProcessUpdate(

const sync_pb::SyncEntity& proto_update,

const Cryptographer* cryptographer,