chrome/browser/background/background_contents_service_factory.h - Issue 12079097: Introduce PrefRegistrySyncable, simplifying 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/background/background_contents_service_factory.h

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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/background/background_contents_service_factory.h

diff --git a/chrome/browser/background/background_contents_service_factory.h b/chrome/browser/background/background_contents_service_factory.h

index 6abdc3eda95da46f25ea15efa7d459a345a8b1ec..2c77ba9c3ee9556a8e6b6b290ee300fb8971824c 100644

--- a/chrome/browser/background/background_contents_service_factory.h

+++ b/chrome/browser/background/background_contents_service_factory.h

@@ -10,7 +10,7 @@

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

class BackgroundContentsService;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

class Profile;

// Singleton that owns all BackgroundContentsServices and associates them with

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

// ProfileKeyedServiceFactory:

virtual ProfileKeyedService* BuildServiceInstanceFor(

Profile* profile) const OVERRIDE;

- virtual void RegisterUserPrefs(PrefServiceSyncable* user_prefs) OVERRIDE;

+ virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE;

// Use a separate background contents service for incognito.

virtual bool ServiceHasOwnInstanceInIncognito() const OVERRIDE;

virtual bool ServiceIsCreatedWithProfile() const OVERRIDE;