[Mac] Redesign of the avatar menu button

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"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 296 matching lines @@
     [super toggleFullScreen:nil];
 }
 
 - (NSPoint)fullScreenButtonOriginAdjustment {
   if (!hasTabStrip_)
     return NSZeroPoint;
 
   // Vertically center the button.
   NSPoint origin = NSMakePoint(0, -6);
 
-  // If there is a profile avatar present, shift the button over by its
-  // width and some padding.
+  // If there is a profile avatar icon present, shift the button over by its
+  // width and some padding. The new avatar button is displayed to the right
+  // of the fullscreen icon, so it doesn't need to be shifted.
   BrowserWindowController* bwc =
       static_cast<BrowserWindowController*>([self windowController]);
-  if ([bwc shouldShowAvatar]) {
-    AvatarButtonController* avatarButtonVC = [bwc avatarButtonController];
-    NSView* avatarButton = [avatarButtonVC view];
+  if ([bwc shouldShowAvatar] && ![bwc shouldUseNewAvatarButton]) {
+    NSView* avatarButton = [[bwc avatarButtonController] view];
     origin.x = -(NSWidth([avatarButton frame]) + 3);
   } 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
@@ skipping 168 matching lines @@
   ThemedWindowStyle windowStyle = [self themedWindowStyle];
   BOOL incognito = windowStyle & THEMED_INCOGNITO;
 
   if (incognito)
     return [NSColor whiteColor];
   else
     return [NSColor windowFrameTextColor];
 }
 
 @end