chrome/browser/search_engines/template_url_service_factory.h - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/search_engines/template_url_prepopulate_data_unittest.cc ('k') | chrome/browser/search_engines/template_url_service_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_service_factory.h

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

index 054142676c6ed14f4c241824b14d87b011f0be14..37270268dbbac5a8761fac2e249f1a358ac0b8fb 100644

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

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

@@ -8,7 +8,7 @@

#include "base/memory/singleton.h"

#include "chrome/browser/profiles/profile_keyed_service_factory.h"

-class PrefService;

+class PrefServiceSyncable;

class Profile;

class TemplateURLService;

@@ -31,7 +31,7 @@ class TemplateURLServiceFactory : public ProfileKeyedServiceFactory {

// ProfileKeyedServiceFactory:

virtual ProfileKeyedService* BuildServiceInstanceFor(

Profile* profile) const OVERRIDE;

- virtual void RegisterUserPrefs(PrefService* user_prefs) OVERRIDE;

+ virtual void RegisterUserPrefs(PrefServiceSyncable* user_prefs) OVERRIDE;

virtual bool ServiceRedirectedInIncognito() const OVERRIDE;

virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;

virtual void ProfileShutdown(Profile* profile) OVERRIDE;