Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2490)

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: 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/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
« no previous file with comments | « chrome/browser/content_settings/cookie_settings.cc ('k') | chrome/browser/content_settings/host_content_settings_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698