diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 19:37:09 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 19:37:09 +0000 |
| commit | ca17d03744b3f8b3ce31e82164e10b3c4a96ad8e (patch) | |
| tree | 4c7adadd629e9978e5cbab7afeff2a19e6fceaba /chrome/browser/profiles | |
| parent | 669c46eed0f7df6774ff807b22d6946491525cdf (diff) | |
| download | chromium_src-ca17d03744b3f8b3ce31e82164e10b3c4a96ad8e.zip chromium_src-ca17d03744b3f8b3ce31e82164e10b3c4a96ad8e.tar.gz chromium_src-ca17d03744b3f8b3ce31e82164e10b3c4a96ad8e.tar.bz2 | |
Revert 72153 - Remove user-related data from local_state and add to user_preferences, in preparation for multi-profile.
devtools
kDevToolsSplitLocation
browser
kBrowserWindowPlacement
Also add a method to browser_prefs to delete obsolete preferences from local state, and fix all related tests.
BUG=66717
TEST=all browser, interactive, and ui tests work properly
Review URL: http://codereview.chromium.org/5915006
TBR=mirandac@chromium.org
Review URL: http://codereview.chromium.org/6247017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles')
| -rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index cdb7091..3b540d1 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -667,11 +667,6 @@ PrefService* ProfileImpl::GetPrefs() { // register known prefs as soon as possible. Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterUserPrefs(prefs_.get()); - // TODO(mirandac): remove migration code after 6 months (crbug.com/69995). - if (g_browser_process->local_state()) { - browser::MigrateBrowserPrefs(prefs_.get(), - g_browser_process->local_state()); - } // The last session exited cleanly if there is no pref for // kSessionExitedCleanly or the value for kSessionExitedCleanly is true. |