chrome/browser/content_settings/cookie_settings.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/content_settings/cookie_settings.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/content_settings/content_settings_pref_provider_unittest.cc ('k') | chrome/browser/content_settings/cookie_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 77f66f3cbd688c79fc3164edb458e6d8e307a596..f76ce0d7590ab3b3f9c917accd85eb4b2d073eb5 100644

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

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

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

class CookieSettingsWrapper;

class GURL;

class PrefService;

+class PrefServiceSyncable;

class Profile;

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

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

bool setting_cookie,

content_settings::SettingSource* source) const;

- static void RegisterUserPrefs(PrefService* prefs);

+ static void RegisterUserPrefs(PrefServiceSyncable* prefs);

class Factory : public RefcountedProfileKeyedServiceFactory {

public:

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

virtual ~Factory();

// |ProfileKeyedBaseFactory| methods:

- virtual void RegisterUserPrefs(PrefService* user_prefs) OVERRIDE;

+ virtual void RegisterUserPrefs(PrefServiceSyncable* user_prefs) OVERRIDE;

virtual bool ServiceRedirectedInIncognito() const OVERRIDE;

virtual scoped_refptr<RefcountedProfileKeyedService>

BuildServiceInstanceFor(Profile* profile) const OVERRIDE;