sync/api/sync_merge_result.cc - 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: sync/api/sync_merge_result.cc

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: sync/api/sync_merge_result.cc

diff --git a/sync/api/sync_merge_result.cc b/sync/api/sync_merge_result.cc

index 0c2fb839722081dcf8ae2eb8bfa164d62cc709f1..601c5777ceb9751b5d0d9486dab913f35f5c7fd2 100644

--- a/sync/api/sync_merge_result.cc

+++ b/sync/api/sync_merge_result.cc

@@ -21,7 +21,7 @@ SyncMergeResult::~SyncMergeResult() {

// Setters.

void SyncMergeResult::set_error(SyncError error) {

- DCHECK(!error.IsSet() || model_type_ == error.type());

+ DCHECK(!error.IsSet() || model_type_ == error.model_type());

error_ = error;

}

« no previous file with comments | « sync/api/sync_error_unittest.cc ('k') | sync/api/sync_merge_result_unittest.cc » ('j') | no next file with comments »