[Mac] Properly show and hide the avatar button for the one-profile case.

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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser_list.h"
-#import "chrome/browser/ui/cocoa/browser/avatar_button.h"
+#import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/ui/cocoa/focus_tracker.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/previewable_contents_controller.h"
@@ skipping 320 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()) {
-    [avatarButton_ setFrameSize:NSMakeSize(tabStripHeight,
-                                           tabStripHeight - 5.0)];
+  if ([self shouldShowAvatar]) {
+    NSView* avatarButton = [avatarButtonController_ view];
+    [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,
+        NSMakePoint(width - NSWidth([avatarButton frame]) - badgeOffset,
                     maxY + 2);
-    [avatarButton_ setFrameOrigin:origin];
-    [avatarButton_ setHidden:NO];  // Make sure it's shown.
+    [avatarButton setFrameOrigin:origin];
+    [avatarButton setHidden:NO];  // Make sure it's shown.
   }
 
   return maxY;
 }
 
 - (CGFloat)layoutToolbarAtMinX:(CGFloat)minX
                           maxY:(CGFloat)maxY
                          width:(CGFloat)width {
   NSView* toolbarView = [toolbarController_ view];
   NSRect toolbarFrame = [toolbarView frame];
@@ skipping 237 matching lines @@
 
   // With this call, valgrind complains that a "Conditional jump or move depends
   // on uninitialised value(s)".  The error happens in -[NSThemeFrame
   // drawOverlayRect:].  I'm pretty convinced this is an Apple bug, but there is
   // no visual impact.  I have been unable to tickle it away with other window
   // or view manipulation Cocoa calls.  Stack added to suppressions_mac.txt.
   [contentView setAutoresizesSubviews:YES];
   [destWindow setContentView:contentView];
 
   // Move the incognito badge if present.
-  if (avatarButton_.get()) {
-    [avatarButton_ removeFromSuperview];
-    [avatarButton_ setHidden:YES];  // Will be shown in layout.
-    [[[destWindow contentView] superview] addSubview:avatarButton_];
+  if ([self shouldShowAvatar]) {
+    [[avatarButtonController_ view] removeFromSuperview];
+    [[avatarButtonController_ view] setHidden:YES];  // Will be shown in layout.
+    [[[destWindow contentView] superview] addSubview:
+        [avatarButtonController_ view]];
   }
 
   // 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 243 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [presentationModeController_ cancelAnimationAndTimers];
 }
 
 @end  // @implementation BrowserWindowController(Private)