Add managed user avatar menu for mac.

chrome/browser/ui/cocoa/framed_browser_window.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/framed_browser_window.h"
 
 #include "base/logging.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/profiles/profile_info_util.h"
+#include "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "grit/theme_resources.h"
 
 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
@@ skipping 294 matching lines @@
   NSPoint origin = NSMakePoint(0, -6);
 
   // If there is a profile avatar present, shift the button over by its
   // width and some padding.
   BrowserWindowController* bwc =
       static_cast<BrowserWindowController*>([self windowController]);
   if ([bwc shouldShowAvatar]) {
     AvatarButtonController* avatarButtonVC = [bwc avatarButtonController];
     NSView* avatarButton = [avatarButtonVC view];
     origin.x = -(NSWidth([avatarButton frame]) + 3);
+    if ([avatarButtonVC labelView])
+      origin.x -= NSWidth([[avatarButtonVC labelView] frame]) + 10;
   } else {
     origin.x -= 6;
   }
 
   return origin;
 }
 
 - (void)drawCustomFrameRect:(NSRect)rect forView:(NSView*)view {
   // WARNING: There is an obvious optimization opportunity here that you DO NOT
   // want to take. To save painting cycles, you might think it would be a good
@@ skipping 196 matching lines @@
   if (titleColor)
     return titleColor;
 
   if (incognito)
     return [NSColor whiteColor];
   else
     return [NSColor windowFrameTextColor];
 }
 
 @end