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

BUG=none
TEST=With multi profiles enabled, avatars aren't smaller than they should be.


Review URL: http://codereview.chromium.org/7584015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96490 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/cocoa/browser/avatar_button.mm

@@ -78,6 +78,9 @@ class Observer : public NotificationObserver {
     [button_ setButtonType:NSMomentaryLightButton];
     [button_ setImagePosition:NSImageOnly];
     [[button_ cell] setImageScaling:NSImageScaleProportionallyDown];
+    [[button_ cell] setImagePosition:NSImageBelow];
+    // AppKit sets a title for some reason when using |-setImagePosition:|.
+    [button_ setTitle:nil];
     [[button_ cell] setImageDimsWhenDisabled:NO];
     [[button_ cell] setHighlightsBy:NSContentsCellMask];
     [[button_ cell] setShowsStateBy:NSContentsCellMask];

chrome/browser/ui/cocoa/browser_window_controller_private.mm

@@ -371,8 +371,8 @@ willPositionSheet:(NSWindow*)sheet
 
   // 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