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

Unified Diff: chrome/browser/web_resource/notification_promo.cc

Issue 12320064: Fix prefs registration in promo code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge LKGR 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/web_resource/notification_promo.cc
diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc
index a6dc0745ce16f077c3c95f8cc4ac3572def970c7..e5055e27bac52f9c4533c1fcd1fa657a2e26ee40 100644
--- a/chrome/browser/web_resource/notification_promo.cc
+++ b/chrome/browser/web_resource/notification_promo.cc
@@ -315,14 +315,17 @@ void NotificationPromo::RegisterPrefs(PrefRegistrySimple* registry) {
}
// static
-void NotificationPromo::RegisterUserPrefs(PrefService* prefs,
- PrefRegistrySyncable* registry) {
- // TODO(dbeam): Remove in M28 when we're reasonably sure all prefs are gone.
+void NotificationPromo::RegisterUserPrefs(PrefRegistrySyncable* registry) {
+ // TODO(dbeam): Registered only for migration. Remove in M28 when
+ // we're reasonably sure all prefs are gone.
// http://crbug.com/168887
- // TODO(joi): Remove PrefService parameter; move this to migration code.
registry->RegisterDictionaryPref(kPrefPromoObject,
PrefRegistrySyncable::UNSYNCABLE_PREF);
- prefs->ClearPref(kPrefPromoObject);
+}
+
+// static
+void NotificationPromo::MigrateUserPrefs(PrefService* user_prefs) {
+ user_prefs->ClearPref(kPrefPromoObject);
}
void NotificationPromo::WritePrefs() {
« no previous file with comments | « chrome/browser/web_resource/notification_promo.h ('k') | chrome/browser/web_resource/promo_resource_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698