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

Unified Diff: chrome/browser/translate/translate_prefs.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/translate/translate_prefs.cc
diff --git a/chrome/browser/translate/translate_prefs.cc b/chrome/browser/translate/translate_prefs.cc
index a642cb1666f5d261f6c69f6cba6b5c99772fd4c9..36a900bc91adfe3d5aa0d039f08fd03dcc8959ae 100644
--- a/chrome/browser/translate/translate_prefs.cc
+++ b/chrome/browser/translate/translate_prefs.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/translate/translate_prefs.h"
#include "base/string_util.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
@@ -148,24 +149,25 @@ bool TranslatePrefs::ShouldAutoTranslate(PrefService* user_prefs,
return prefs.IsLanguageWhitelisted(original_language, target_language);
}
-void TranslatePrefs::RegisterUserPrefs(PrefServiceSyncable* user_prefs) {
- if (!user_prefs->FindPreference(kPrefTranslateLanguageBlacklist))
- user_prefs->RegisterListPref(kPrefTranslateLanguageBlacklist,
- PrefServiceSyncable::SYNCABLE_PREF);
- if (!user_prefs->FindPreference(kPrefTranslateSiteBlacklist))
- user_prefs->RegisterListPref(kPrefTranslateSiteBlacklist,
- PrefServiceSyncable::SYNCABLE_PREF);
- if (!user_prefs->FindPreference(kPrefTranslateWhitelists)) {
- user_prefs->RegisterDictionaryPref(kPrefTranslateWhitelists,
- PrefServiceSyncable::SYNCABLE_PREF);
- MigrateTranslateWhitelists(user_prefs);
+void TranslatePrefs::RegisterUserPrefs(PrefService* prefs,
+ PrefRegistrySyncable* registry) {
+ if (!prefs->FindPreference(kPrefTranslateLanguageBlacklist))
+ registry->RegisterListPref(kPrefTranslateLanguageBlacklist,
+ PrefRegistrySyncable::SYNCABLE_PREF);
+ if (!prefs->FindPreference(kPrefTranslateSiteBlacklist))
+ registry->RegisterListPref(kPrefTranslateSiteBlacklist,
+ PrefRegistrySyncable::SYNCABLE_PREF);
+ if (!prefs->FindPreference(kPrefTranslateWhitelists)) {
+ registry->RegisterDictionaryPref(kPrefTranslateWhitelists,
+ PrefRegistrySyncable::SYNCABLE_PREF);
+ MigrateTranslateWhitelists(prefs);
}
- if (!user_prefs->FindPreference(kPrefTranslateDeniedCount))
- user_prefs->RegisterDictionaryPref(kPrefTranslateDeniedCount,
- PrefServiceSyncable::SYNCABLE_PREF);
- if (!user_prefs->FindPreference(kPrefTranslateAcceptedCount))
- user_prefs->RegisterDictionaryPref(kPrefTranslateAcceptedCount,
- PrefServiceSyncable::SYNCABLE_PREF);
+ if (!prefs->FindPreference(kPrefTranslateDeniedCount))
+ registry->RegisterDictionaryPref(kPrefTranslateDeniedCount,
+ PrefRegistrySyncable::SYNCABLE_PREF);
+ if (!prefs->FindPreference(kPrefTranslateAcceptedCount))
+ registry->RegisterDictionaryPref(kPrefTranslateAcceptedCount,
+ PrefRegistrySyncable::SYNCABLE_PREF);
}
// TranslatePrefs: private, static: --------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698