chrome/browser/sync/glue/bookmark_model_associator.h - Issue 15701022: [Sync] Add support for sync Persistence Errors

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/glue/bookmark_model_associator.h

Issue 15701022: [Sync] Add support for sync Persistence Errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move bookmark change into separate patch Created 7 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:

Index: chrome/browser/sync/glue/bookmark_model_associator.h

diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h

index 8a0ff5fbce4c42c08b0ec85c7fae62b7494fe4b3..cf348b7bb6c86fd3c1034595534ef4e94e9d7d51 100644

--- a/chrome/browser/sync/glue/bookmark_model_associator.h

+++ b/chrome/browser/sync/glue/bookmark_model_associator.h

@@ -141,8 +141,11 @@ class BookmarkModelAssociator

// Check whether bookmark model and sync model are synced by comparing

// their transaction versions.

- void CheckModelSyncState(syncer::SyncMergeResult* local_merge_result,

- syncer::SyncMergeResult* syncer_merge_result) const;

+ // Returns a PERSISTENCE_ERROR if a transaction mismatch was detected where

+ // the native model has a newer transaction verison.

+ syncer::SyncError CheckModelSyncState(

+ syncer::SyncMergeResult* local_merge_result,

+ syncer::SyncMergeResult* syncer_merge_result) const;

BookmarkModel* bookmark_model_;

Profile* profile_;