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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 944433002: Revamp the MigrateBrowserPrefs and MigrateUserPrefs code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: extra removal Created 5 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
« chrome/browser/prefs/browser_prefs.cc ('K') | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/browser_ui_prefs.cc » ('j') | chrome/browser/ui/browser_window_state.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 9b7389fc542cb6ec4b5e9f6408f8e529c20c3b50..ccba65fbdb8db348b15b78b64dd1e27c40242327 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -851,11 +851,10 @@ void ProfileImpl::OnPrefsLoaded(bool success) {
return;
}
- // TODO(mirandac): remove migration code after 6 months (crbug.com/69995).
+ // Migrate obsolete prefs.
if (g_browser_process->local_state())
- chrome::MigrateBrowserPrefs(this, g_browser_process->local_state());
- // TODO(ivankr): remove cleanup code eventually (crbug.com/165672).
- chrome::MigrateUserPrefs(this);
+ chrome::MigrateObsoleteBrowserPrefs(g_browser_process->local_state());
+ chrome::MigrateObsoleteProfilePrefs(GetPrefs());
// |kSessionExitType| was added after |kSessionExitedCleanly|. If the pref
// value is empty fallback to checking for |kSessionExitedCleanly|.
« chrome/browser/prefs/browser_prefs.cc ('K') | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/browser_ui_prefs.cc » ('j') | chrome/browser/ui/browser_window_state.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698