chrome/browser/ui/cocoa/browser/avatar_button_controller.mm - 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/ui/cocoa/browser/avatar_button_controller.mm

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

« chrome/browser/profiles/profiles_state.cc ('K') | « chrome/browser/profiles/profiles_state.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view.cc » ('j') | chrome/browser/ui/views/new_avatar_button.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser/avatar_button_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm

index db3ee1fce0da578e9af9cad9d864c1dea6221975..f115af32b57b361d4b97c5a9f355b10d76581adc 100644

--- a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm

+++ b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm

@@ -139,7 +139,7 @@ NSImage* GetImageFromResourceID(int resourceId) {

[paragraphStyle setAlignment:NSLeftTextAlignment];

NSString* buttonTitle = base::SysUTF16ToNSString(

- profiles::GetActiveProfileDisplayName(browser_));

+ profiles::GetAvatarButtonDisplayNameForProfile(browser_->profile()));

base::scoped_nsobject<NSAttributedString> attributedTitle(

[[NSAttributedString alloc]