chrome/browser/prefs/pref_model_associator.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: chrome/browser/prefs/pref_model_associator.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: chrome/browser/prefs/pref_model_associator.cc

diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc

index c49f10c04191d40259fa74b4c3745cac6c77dfd5..07792cb9fecf1529193f781af2ef87e22ed17179 100644

--- a/chrome/browser/prefs/pref_model_associator.cc

+++ b/chrome/browser/prefs/pref_model_associator.cc

@@ -348,8 +348,9 @@ syncer::SyncError PrefModelAssociator::ProcessSyncChanges(

const syncer::SyncChangeList& change_list) {

if (!models_associated_) {

syncer::SyncError error(FROM_HERE,

- "Models not yet associated.",

- PREFERENCES);

+ syncer::SyncError::DATATYPE_ERROR,

+ "Models not yet associated.",

+ PREFERENCES);

return error;

}

base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true);