chrome/browser/profiles/profile_manager.cc - Issue 171523004: Stop using the old-style profile names when using --new-profile-management

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_manager.cc

Issue 171523004: Stop using the old-style profile names when using --new-profile-management (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: whitespace Created 6 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 | « chrome/browser/profiles/profile_info_cache.cc ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | chrome/browser/profiles/profile_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index ebfe635a8d4569882a55c6c28509b3391b5650c5..e4399561dbf8664a0e032e030f4d413bc8d5e261 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -718,7 +718,10 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {

} else if (profile->GetPath() ==

profiles::GetDefaultProfileDir(cache.GetUserDataDir())) {

avatar_index = 0;

- profile_name = l10n_util::GetStringUTF8(IDS_DEFAULT_PROFILE_NAME);

+ // The --new-profile-management flag no longer uses the "First User" name.

+ profile_name = switches::IsNewProfileManagement() ?

+ base::UTF16ToUTF8(cache.ChooseNameForNewProfile(avatar_index)) :

+ l10n_util::GetStringUTF8(IDS_DEFAULT_PROFILE_NAME);

} else {

avatar_index = cache.ChooseAvatarIconIndexForNewProfile();

profile_name =