chrome/browser/prefs/pref_model_associator.h - Issue 7461098: Reland 87645 with clang fixes.

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

Issue 7461098: Reland 87645 with clang fixes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 9 years, 5 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.h

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

index 15031532fdb0437558c83bbe1613a1eea166e3a0..a185a78cb2c8989788c9955d816e6e1250a914aa 100644

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

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

@@ -37,9 +37,10 @@ class PrefModelAssociator

// SyncableService implementation.

virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE;

- virtual void ProcessSyncChanges(const tracked_objects::Location& from_here,

- const SyncChangeList& change_list) OVERRIDE;

- virtual bool MergeDataAndStartSyncing(

+ virtual SyncError ProcessSyncChanges(

+ const tracked_objects::Location& from_here,

+ const SyncChangeList& change_list) OVERRIDE;

+ virtual SyncError MergeDataAndStartSyncing(

syncable::ModelType type,

const SyncDataList& initial_sync_data,

SyncChangeProcessor* sync_processor) OVERRIDE;

« no previous file with comments | « no previous file | chrome/browser/prefs/pref_model_associator.cc » ('j') | no next file with comments »