| 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(
|
|
|