chrome/browser/content_settings/cookie_settings.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/content_settings/cookie_settings.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/content_settings/cookie_settings.h

diff --git a/chrome/browser/content_settings/cookie_settings.h b/chrome/browser/content_settings/cookie_settings.h

index f76ce0d7590ab3b3f9c917accd85eb4b2d073eb5..5be1c4ca955510a5e8f06d4c2e4d50d9731a1025 100644

--- a/chrome/browser/content_settings/cookie_settings.h

+++ b/chrome/browser/content_settings/cookie_settings.h

@@ -21,7 +21,7 @@ class ContentSettingsPattern;

class CookieSettingsWrapper;

class GURL;

class PrefService;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

class Profile;

// A frontend to the cookie settings of |HostContentSettingsMap|. Handles

@@ -102,7 +102,7 @@ class CookieSettings

bool setting_cookie,

content_settings::SettingSource* source) const;

- static void RegisterUserPrefs(PrefServiceSyncable* prefs);

+ static void RegisterUserPrefs(PrefRegistrySyncable* registry);

class Factory : public RefcountedProfileKeyedServiceFactory {

public:

@@ -120,7 +120,7 @@ class CookieSettings

virtual ~Factory();

// |ProfileKeyedBaseFactory| methods:

- virtual void RegisterUserPrefs(PrefServiceSyncable* user_prefs) OVERRIDE;

+ virtual void RegisterUserPrefs(PrefRegistrySyncable* registry) OVERRIDE;

virtual bool ServiceRedirectedInIncognito() const OVERRIDE;

virtual scoped_refptr<RefcountedProfileKeyedService>

BuildServiceInstanceFor(Profile* profile) const OVERRIDE;