Add managed user avatar menu for mac.

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/memory/scoped_nsobject.h"
@@ skipping 324 matching lines @@
   // 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.
   if ([self shouldShowAvatar]) {
     NSView* avatarButton = [avatarButtonController_ view];
     CGFloat buttonHeight = std::min(
         static_cast<CGFloat>(profiles::kAvatarIconHeight), tabStripHeight);
-    [avatarButton setFrameSize:NSMakeSize(profiles::kAvatarIconWidth,
+    [avatarButton setFrameSize:NSMakeSize(NSWidth([avatarButton frame]),
                                           buttonHeight)];
 
     // Actually place the badge *above* |maxY|, by +2 to miss the divider.
     CGFloat badgeXOffset = -kAvatarRightOffset;
     CGFloat badgeYOffset = 2 * [[avatarButton superview] cr_lineWidth];
     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()) {
     FramedBrowserWindow* window =
         static_cast<FramedBrowserWindow*>([self window]);
     DCHECK([window isKindOfClass:[FramedBrowserWindow class]]);
     rightIndent += -[window fullScreenButtonOriginAdjustment].x;
   } else if ([self shouldShowAvatar]) {
     rightIndent += kAvatarTabStripShrink;
+    if ([avatarButtonController_ labelView]) {
+      rightIndent += NSWidth([[avatarButtonController_ labelView] frame]) +
+                     kAvatarRightOffset;
+    }
   }
   [tabStripController_ setRightIndentForControls:rightIndent];
 
   // Go ahead and layout the tabs.
   [tabStripController_ layoutTabsWithoutAnimation];
 
   return maxY;
 }
 
 - (CGFloat)layoutToolbarAtMinX:(CGFloat)minX
@@ skipping 651 matching lines @@
 
 - (void)updateAllowOverlappingViews:(BOOL)inPresentationMode {
   WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
   if (!contents)
     return;
   contents->GetView()->SetAllowOverlappingViews(
       [self shouldAllowOverlappingViews:inPresentationMode]);
 }
 
 @end  // @implementation BrowserWindowController(Private)