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 334 matching lines @@
                                           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.
+
+    NSTextField* avatarLabel = [avatarButtonController_ labelView];
+    if (avatarLabel) {
+      CGFloat labelHeight = NSHeight([avatarLabel frame]);
+      origin = NSMakePoint(badgeXOffset - NSWidth([avatarLabel frame]),
+                           (buttonHeight - labelHeight) / 2);
+      [avatarLabel setFrameOrigin:origin];
+      [avatarLabel setHidden:NO];
+    }
   }
 
   // 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 201 matching lines @@
   // or view manipulation Cocoa calls.  Stack added to suppressions_mac.txt.
   [contentView setAutoresizesSubviews:YES];
   [destWindow setContentView:contentView];
 
   // Move the incognito badge if present.
   if ([self shouldShowAvatar]) {
     [[avatarButtonController_ view] removeFromSuperview];
     [[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
   // badge (if any), so that the tab strip will be on top (in the z-order).
   if ([self hasTabStrip])
     [[[destWindow contentView] superview] addSubview:tabStripView];
 
   [sourceWindow setWindowController:nil];
   [self setWindow:destWindow];
   [destWindow setWindowController:self];
@@ skipping 407 matching lines @@
                          relativeTo:[bookmarkBarController_ view]];
     } else {
       [contentView cr_ensureSubview:floatingBarBackingView_
                        isPositioned:NSWindowBelow
                          relativeTo:[bookmarkBarController_ view]];
     }
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)