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

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

Patch Set: Address review comments. 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/cookie_settings.cc ('k') | chrome/browser/content_settings/host_content_settings_map.cc » ('j') | chrome/browser/extensions/app_notify_channel_setup_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map.h

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

index 602ff15f1f76535eef7e7a8f98915fae461d27b8..74421fa29fc4456915791e1823d8c384c56936b7 100644

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

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

@@ -33,6 +33,7 @@ class ProviderInterface;

class ExtensionService;

class GURL;

class PrefService;

+class PrefServiceSyncable;

class HostContentSettingsMap

: public content_settings::Observer,

@@ -47,8 +48,7 @@ class HostContentSettingsMap

NUM_PROVIDER_TYPES,

};

- HostContentSettingsMap(PrefService* prefs,

- bool incognito);

+ HostContentSettingsMap(PrefService* prefs, bool incognito);

#if defined(ENABLE_EXTENSIONS)

// In some cases, the ExtensionService is not available at the time the

@@ -57,7 +57,7 @@ class HostContentSettingsMap

void RegisterExtensionService(ExtensionService* extension_service);

#endif

- static void RegisterUserPrefs(PrefService* prefs);

+ static void RegisterUserPrefs(PrefServiceSyncable* prefs);

// Returns the default setting for a particular content type. If |provider_id|

// is not NULL, the id of the provider which provided the default setting is