chrome/browser/bookmarks/bookmark_model_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/bookmarks/bookmark_model_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

Index: chrome/browser/bookmarks/bookmark_model_factory.h

diff --git a/chrome/browser/bookmarks/bookmark_model_factory.h b/chrome/browser/bookmarks/bookmark_model_factory.h

index 72ed21e92060386ebf846d6203ee6a4b94cbcf68..5ad84d7725f770b7ed771bfe9c4b4741d98a551e 100644

--- a/chrome/browser/bookmarks/bookmark_model_factory.h

+++ b/chrome/browser/bookmarks/bookmark_model_factory.h

@@ -11,6 +11,7 @@

template <typename T> struct DefaultSingletonTraits;

+class PrefServiceSyncable;

class Profile;

class BookmarkModel;

@@ -33,7 +34,7 @@ class BookmarkModelFactory : 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;

« no previous file with comments | « chrome/browser/background/background_mode_manager.cc ('k') | chrome/browser/bookmarks/bookmark_model_factory.cc » ('j') | no next file with comments »