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

Unified Diff: chrome/browser/prefs/browser_prefs.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
« no previous file with comments | « no previous file | chrome/browser/web_resource/notification_promo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ee5bf22ab37b644ca1792be6934f0ec86a91fa88..72b2f7c7a39ca3f62bc0c653e66d8f957016c251 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -293,7 +293,7 @@ void RegisterUserPrefs(PrefService* user_prefs,
PrefProxyConfigTrackerImpl::RegisterUserPrefs(registry);
PrefsTabHelper::RegisterUserPrefs(registry);
ProfileImpl::RegisterUserPrefs(registry);
- PromoResourceService::RegisterUserPrefs(user_prefs, registry);
+ PromoResourceService::RegisterUserPrefs(registry);
ProtocolHandlerRegistry::RegisterUserPrefs(registry);
RegisterBrowserUserPrefs(registry);
SessionStartupPref::RegisterUserPrefs(registry);
@@ -369,6 +369,7 @@ void MigrateUserPrefs(Profile* profile) {
prefs->ClearPref(kBackupPref);
PrefsTabHelper::MigrateUserPrefs(prefs);
+ PromoResourceService::MigrateUserPrefs(prefs);
}
void MigrateBrowserPrefs(Profile* profile, PrefService* local_state) {
« no previous file with comments | « no previous file | chrome/browser/web_resource/notification_promo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698