chrome/browser/search_engines/template_url_service.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/search_engines/template_url_service.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

Index: chrome/browser/search_engines/template_url_service.h

diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h

index c8ee77c14ddeb4e659112289a521bc5e0930c230..9fd8eed5b8ba8d0b33398f41e26351373baa5f5f 100644

--- a/chrome/browser/search_engines/template_url_service.h

+++ b/chrome/browser/search_engines/template_url_service.h

@@ -273,7 +273,7 @@ class TemplateURLService : public WebDataServiceConsumer,

virtual SyncError MergeDataAndStartSyncing(

syncable::ModelType type,

const SyncDataList& initial_sync_data,

- SyncChangeProcessor* sync_processor) OVERRIDE;

+ scoped_ptr<SyncChangeProcessor> sync_processor) OVERRIDE;

virtual void StopSyncing(syncable::ModelType type) OVERRIDE;

// Processes a local TemplateURL change for Sync. |turl| is the TemplateURL

@@ -584,7 +584,7 @@ class TemplateURLService : public WebDataServiceConsumer,

bool processing_syncer_changes_;

// Sync's SyncChange handler. We push all our changes through this.

- SyncChangeProcessor* sync_processor_;

+ scoped_ptr<SyncChangeProcessor> sync_processor_;

// Whether or not we are waiting on the default search provider to come in

// from Sync. This is to facilitate the fact that changes to the value of

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