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

Unified Diff: chrome/browser/themes/theme_service_factory.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
« no previous file with comments | « chrome/browser/themes/theme_service_factory.h ('k') | chrome/browser/translate/translate_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service_factory.cc
diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
index 451659cec9959943ff12f9447aaf8120d620e14c..9264aa1e3b043fac71c790d628309b45484368e1 100644
--- a/chrome/browser/themes/theme_service_factory.cc
+++ b/chrome/browser/themes/theme_service_factory.cc
@@ -58,26 +58,34 @@ ProfileKeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
return provider;
}
-void ThemeServiceFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+void ThemeServiceFactory::RegisterUserPrefs(
+ user_prefs::PrefRegistrySyncable* registry) {
#if defined(TOOLKIT_GTK)
- registry->RegisterBooleanPref(prefs::kUsesSystemTheme,
- GtkThemeService::DefaultUsesSystemTheme(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(
+ prefs::kUsesSystemTheme,
+ GtkThemeService::DefaultUsesSystemTheme(),
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
#endif
- registry->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
- base::FilePath(),
- PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterStringPref(prefs::kCurrentThemeID,
- ThemeService::kDefaultThemeID,
- PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterDictionaryPref(prefs::kCurrentThemeImages,
- PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterDictionaryPref(prefs::kCurrentThemeColors,
- PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterDictionaryPref(prefs::kCurrentThemeTints,
- PrefRegistrySyncable::UNSYNCABLE_PREF);
- registry->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties,
- PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterFilePathPref(
+ prefs::kCurrentThemePackFilename,
+ base::FilePath(),
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterStringPref(
+ prefs::kCurrentThemeID,
+ ThemeService::kDefaultThemeID,
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterDictionaryPref(
+ prefs::kCurrentThemeImages,
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterDictionaryPref(
+ prefs::kCurrentThemeColors,
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterDictionaryPref(
+ prefs::kCurrentThemeTints,
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterDictionaryPref(
+ prefs::kCurrentThemeDisplayProperties,
+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
}
content::BrowserContext* ThemeServiceFactory::GetBrowserContextToUse(
« no previous file with comments | « chrome/browser/themes/theme_service_factory.h ('k') | chrome/browser/translate/translate_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698