chrome/browser/profiles/profile_impl.cc - Issue 5915006: Remove user-related data from local_state and add to user_preferences, i...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 5915006: Remove user-related data from local_state and add to user_preferences, i... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 11 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/profiles/profile_impl.cc

===================================================================

--- chrome/browser/profiles/profile_impl.cc (revision 73335)

+++ chrome/browser/profiles/profile_impl.cc (working copy)

@@ -692,6 +692,11 @@

// 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.

« no previous file with comments | « chrome/browser/prefs/pref_service_uitest.cc ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »