Index: chrome/browser/ui/cocoa/browser_window_controller_private.mm |
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
index 2eebe957871c1c194e375876b17e6b85231e9cee..37d450bdac4681da508d952eeea6ef03b4f8f5dc 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
@@ -352,6 +352,16 @@ willPositionSheet:(NSWindow*)sheet |
maxY + badgeYOffset); |
[avatarButton setFrameOrigin:origin]; |
[avatarButton setHidden:NO]; // Make sure it's shown. |
+ |
+ NSTextField* avatarLabel = [avatarButtonController_ labelView]; |
+ if (avatarLabel) { |
+ CGFloat labelHeight = NSHeight([avatarLabel frame]); |
+ origin = |
+ NSMakePoint(origin.x - NSWidth([avatarLabel frame]) + badgeXOffset, |
+ maxY + badgeYOffset + (buttonHeight - labelHeight) / 2); |
+ [avatarLabel setFrameOrigin:origin]; |
+ [avatarLabel setHidden:NO]; |
+ } |
} |
// Calculate the right indentation. The default indentation built into the |
@@ -366,6 +376,10 @@ willPositionSheet:(NSWindow*)sheet |
rightIndent += -[window fullScreenButtonOriginAdjustment].x; |
} else if ([self shouldShowAvatar]) { |
rightIndent += kAvatarTabStripShrink; |
+ if ([avatarButtonController_ labelView]) { |
+ rightIndent += NSWidth([[avatarButtonController_ labelView] frame]) + |
+ kAvatarRightOffset; |
+ } |
} |
[tabStripController_ setRightIndentForControls:rightIndent]; |
@@ -587,6 +601,12 @@ willPositionSheet:(NSWindow*)sheet |
[[avatarButtonController_ view] setHidden:YES]; // Will be shown in layout. |
[[[destWindow contentView] superview] addSubview: |
[avatarButtonController_ view]]; |
+ if ([avatarButtonController_ labelView]) { |
+ [[avatarButtonController_ labelView] removeFromSuperview]; |
+ [[avatarButtonController_ labelView] setHidden:YES]; |
+ [[[destWindow contentView] superview] |
+ addSubview:[avatarButtonController_ labelView]]; |
+ } |
} |
// Add the tab strip after setting the content view and moving the incognito |