chrome/browser/extensions/settings/settings_backend.h - Issue 9749012: [Sync] Have SyncableService's take ownership of their SyncChangeProcessor.

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/extensions/settings/settings_backend.h

Issue 9749012: [Sync] Have SyncableService's take ownership of their SyncChangeProcessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflict Created 8 years, 9 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/settings/settings_apitest.cc ('k') | chrome/browser/extensions/settings/settings_backend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/settings/settings_backend.h

diff --git a/chrome/browser/extensions/settings/settings_backend.h b/chrome/browser/extensions/settings/settings_backend.h

index 6f09cd6165cd14885b243fc9375774a2fefd0805..26bea441a63d358ef1fff916ee64faa8340a51c4 100644

--- a/chrome/browser/extensions/settings/settings_backend.h

+++ b/chrome/browser/extensions/settings/settings_backend.h

@@ -48,7 +48,7 @@ class SettingsBackend : public SyncableService {

virtual SyncError MergeDataAndStartSyncing(

syncable::ModelType type,

const SyncDataList& initial_sync_data,

- SyncChangeProcessor* sync_processor) OVERRIDE;

+ scoped_ptr<SyncChangeProcessor> sync_processor) OVERRIDE;

virtual SyncError ProcessSyncChanges(

const tracked_objects::Location& from_here,

const SyncChangeList& change_list) OVERRIDE;

@@ -88,7 +88,7 @@ class SettingsBackend : public SyncableService {

syncable::ModelType sync_type_;

// Current sync processor, if any.

- SyncChangeProcessor* sync_processor_;

+ scoped_ptr<SyncChangeProcessor> sync_processor_;

DISALLOW_COPY_AND_ASSIGN(SettingsBackend);

};

« no previous file with comments | « chrome/browser/extensions/settings/settings_apitest.cc ('k') | chrome/browser/extensions/settings/settings_backend.cc » ('j') | no next file with comments »