[Mac] Fix new avatar button bugs

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #import "base/mac/scoped_nsobject.h"
@@ skipping 301 matching lines @@
   CGFloat tabStripHeight = NSHeight([tabStripView frame]);
   maxY -= tabStripHeight;
   [tabStripView setFrame:NSMakeRect(0, maxY, width, tabStripHeight)];
 
   // Set left indentation based on fullscreen mode status.
   [tabStripController_ setLeftIndentForControls:(fullscreen ? 0 :
       [[tabStripController_ class] defaultLeftIndentForControls])];
 
   // Lay out the icognito/avatar badge because calculating the indentation on
   // the right depends on it.
+  NSView* avatarButton = [avatarButtonController_ view];
   if ([self shouldShowAvatar]) {
-    NSView* avatarButton = [avatarButtonController_ view];
     CGFloat badgeXOffset = -kAvatarRightOffset;
     CGFloat badgeYOffset = 0;
-    CGFloat buttonHeight;
+    CGFloat buttonHeight = NSHeight([avatarButton frame]);
 
     if ([self shouldUseNewAvatarButton]) {
       // The fullscreen icon is displayed to the right of the avatar button.
       if (![self isFullscreen])
         badgeXOffset -= kFullscreenIconWidth;
-
       // Center the button vertically on the tabstrip.
-      buttonHeight = NSHeight([avatarButton frame]);
       badgeYOffset = (tabStripHeight - buttonHeight) / 2;
     } else {
-      buttonHeight = static_cast<CGFloat>(profiles::kAvatarIconHeight);
       // Actually place the badge *above* |maxY|, by +2 to miss the divider.
       badgeYOffset = 2 * [[avatarButton superview] cr_lineWidth];
+    }
 
-    }
     [avatarButton setFrameSize:NSMakeSize(NSWidth([avatarButton frame]),
         std::min(buttonHeight, tabStripHeight))];
     NSPoint origin =
         NSMakePoint(width - NSWidth([avatarButton frame]) + badgeXOffset,
                     maxY + badgeYOffset);
     [avatarButton setFrameOrigin:origin];
     [avatarButton setHidden:NO];  // Make sure it's shown.
   }
 
   // Calculate the right indentation.  The default indentation built into the
   // tabstrip leaves enough room for the fullscreen button or presentation mode
   // toggle button on Lion.  On non-Lion systems, the right indent needs to be
   // adjusted to make room for the new tab button when an avatar is present.
   CGFloat rightIndent = 0;
   if (base::mac::IsOSLionOrLater() &&
       [[self window] isKindOfClass:[FramedBrowserWindow class]]) {
     FramedBrowserWindow* window =
         static_cast<FramedBrowserWindow*>([self window]);
     rightIndent += -[window fullScreenButtonOriginAdjustment].x;
+
+    // The new avatar is wider than the default indentation, so we need to
+    // account for its width.
+    if ([self shouldUseNewAvatarButton])
+      rightIndent += NSWidth([avatarButton frame]) + kAvatarTabStripShrink;
   } else if ([self shouldShowAvatar]) {
-    rightIndent += kAvatarTabStripShrink;
-    if ([self shouldUseNewAvatarButton]) {
-      rightIndent += NSWidth([[avatarButtonController_ view] frame])
-        + kAvatarTabStripShrink;
-    } else {
-      NSButton* labelButton =
-          [static_cast<AvatarIconController*>(avatarButtonController_)
-              labelButtonView];
-      if (labelButton)
-        rightIndent += NSWidth([labelButton frame]) + kAvatarRightOffset;
-    }
+    rightIndent += kAvatarTabStripShrink +
+        NSWidth([avatarButton frame]) + kAvatarRightOffset;
   }
   [tabStripController_ setRightIndentForControls:rightIndent];
 
   // Go ahead and layout the tabs.
   [tabStripController_ layoutTabsWithoutAnimation];
 
   return maxY;
 }
 
 - (CGFloat)layoutToolbarAtMinX:(CGFloat)minX
@@ skipping 628 matching lines @@
   }
 }
 
 - (void)updateInfoBarTipVisibility {
   // If there's no toolbar then hide the infobar tip.
   [infoBarContainerController_
       setShouldSuppressTopInfoBarTip:![self hasToolbar]];
 }
 
 @end  // @implementation BrowserWindowController(Private)