| 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..833cb65cc5d07f51f5c88697aa15b2572cb71f26 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.
|
| +
|
| + if (avatarLabelController_.get()) {
|
| + NSView* avatarLabel = [avatarLabelController_ view];
|
| + 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 (avatarLabelController_.get()) {
|
| + rightIndent +=
|
| + NSWidth([[avatarLabelController_ view] 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 (avatarLabelController_.get()) {
|
| + [[avatarLabelController_ view] removeFromSuperview];
|
| + [[avatarLabelController_ view] setHidden:YES];
|
| + [[[destWindow contentView] superview]
|
| + addSubview:[avatarLabelController_ view]];
|
| + }
|
| }
|
|
|
| // Add the tab strip after setting the content view and moving the incognito
|
|
|