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

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

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 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:
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 67a5f9df2c5ba46d37f78b4b6be4b8771ced265d..51592fa23dfed165529f4c1327c65b1a8492813d 100644
--- a/chrome/browser/content_settings/content_settings_default_provider.cc
+++ b/chrome/browser/content_settings/content_settings_default_provider.cc
@@ -87,7 +87,8 @@ class DefaultRuleIterator : public RuleIterator {
} // namespace
// static
-void DefaultProvider::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+void DefaultProvider::RegisterUserPrefs(
+ user_prefs::PrefRegistrySyncable* registry) {
// 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
@@ -95,9 +96,10 @@ void DefaultProvider::RegisterUserPrefs(PrefRegistrySyncable* registry) {
// TODO(markusheintz): Write pyauto hooks for the content settings map as
// content settings should be read from the host content settings map.
DictionaryValue* default_content_settings = new DictionaryValue();
- registry->RegisterDictionaryPref(prefs::kDefaultContentSettings,
- default_content_settings,
- PrefRegistrySyncable::SYNCABLE_PREF);
+ registry->RegisterDictionaryPref(
+ prefs::kDefaultContentSettings,
+ default_content_settings,
+ user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
}
DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)

Powered by Google App Engine
This is Rietveld 408576698