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

Unified Diff: chrome/browser/themes/theme_service_factory.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. Created 7 years, 10 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/themes/theme_service_factory.cc
diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
index 86072d624ed3858a865712f291d943fe6d56d786..a0beab6cf3621b4274e1b6d01b171cb99db222fc 100644
--- a/chrome/browser/themes/theme_service_factory.cc
+++ b/chrome/browser/themes/theme_service_factory.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_dependency_manager.h"
@@ -56,26 +57,26 @@ ProfileKeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
return provider;
}
-void ThemeServiceFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void ThemeServiceFactory::RegisterUserPrefs(PrefRegistrySyncable* registry) {
#if defined(TOOLKIT_GTK)
- prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
- GtkThemeService::DefaultUsesSystemTheme(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ registry->RegisterBooleanPref(prefs::kUsesSystemTheme,
+ GtkThemeService::DefaultUsesSystemTheme(),
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
#endif
- prefs->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
- FilePath(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kCurrentThemeID,
- ThemeService::kDefaultThemeID,
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterDictionaryPref(prefs::kCurrentThemeImages,
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterDictionaryPref(prefs::kCurrentThemeColors,
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterDictionaryPref(prefs::kCurrentThemeTints,
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterDictionaryPref(prefs::kCurrentThemeDisplayProperties,
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ registry->RegisterFilePathPref(prefs::kCurrentThemePackFilename,
+ 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);
}
bool ThemeServiceFactory::ServiceRedirectedInIncognito() const {

Powered by Google App Engine
This is Rietveld 408576698