[Mac] Fix avatar size after new icon drop. The image scaling behaves weird in a button cell.

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // Copyright (c) 2011 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 353 matching lines @@
   CGFloat rightIndent = 0;
   if ([self shouldShowAvatar])
     rightIndent += (kAvatarTabStripShrink + possibleExtraShiftForLion);
   [tabStripController_ setRightIndentForControls:rightIndent];
 
   // Go ahead and layout the tabs.
   [tabStripController_ layoutTabsWithoutAnimation];
 
   // Now lay out incognito badge together with the tab strip.
   if (avatarButton_.get()) {
-    CGFloat sizeSquare = tabStripHeight - 5.0;
-    [avatarButton_ setFrameSize:NSMakeSize(sizeSquare, sizeSquare)];
+    [avatarButton_ setFrameSize:NSMakeSize(tabStripHeight,
+                                           tabStripHeight - 5.0)];
 
     // Actually place the badge *above* |maxY|, by +2 to miss the divider.  On
     // Lion or later, shift the badge left to move it away from the fullscreen
     // button.
     CGFloat badgeOffset = kAvatarRightOffset + possibleExtraShiftForLion;
     NSPoint origin =
         NSMakePoint(width - NSWidth([avatarButton_ frame]) - badgeOffset,
                     maxY + 2);
     [avatarButton_ setFrameOrigin:origin];
     [avatarButton_ setHidden:NO];  // Make sure it's shown.
@@ skipping 484 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [presentationModeController_ cancelAnimationAndTimers];
 }
 
 @end  // @implementation BrowserWindowController(Private)