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

Unified Diff: chrome/browser/content_settings/content_settings_default_provider.cc

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/content_settings_default_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc
index b4a18cf2602050f578859f90c69ddce5f0724c48..f6304a1af38f3fa775f17a02fa17b188630e623a 100644
--- a/chrome/browser/content_settings/content_settings_default_provider.cc
+++ b/chrome/browser/content_settings/content_settings_default_provider.cc
@@ -87,7 +87,7 @@ class DefaultRuleIterator : public RuleIterator {
} // namespace
// static
-void DefaultProvider::RegisterUserPrefs(PrefService* prefs) {
+void DefaultProvider::RegisterUserPrefs(PrefServiceSyncable* prefs) {
// The registration of the preference prefs::kDefaultContentSettings should
// also include the default values for default content settings. This allows
// functional tests to get default content settings by reading the preference
@@ -97,7 +97,7 @@ void DefaultProvider::RegisterUserPrefs(PrefService* prefs) {
DictionaryValue* default_content_settings = new DictionaryValue();
prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings,
default_content_settings,
- PrefService::SYNCABLE_PREF);
+ PrefServiceSyncable::SYNCABLE_PREF);
}
DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)

Powered by Google App Engine
This is Rietveld 408576698