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

chrome/browser/ui/cocoa/browser_window_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 #pragma once
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
@@ skipping 10 matching lines @@
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_resizer.h"
 #include "ui/gfx/rect.h"
 
-@class AvatarButton;
+@class AvatarButtonController;
 class Browser;
 class BrowserWindow;
 class BrowserWindowCocoa;
 class ConstrainedWindowMac;
 @class DevToolsController;
 @class DownloadShelfController;
 @class FindBarCocoaController;
 @class FullscreenWindow;
 @class GTMWindowSheetController;
 @class InfoBarContainerController;
@@ skipping 61 matching lines @@
   // with two-finger gestures enabled in the Trackpad preferences. This will
   // contain the NSTouch objects from |-beginGestureWithEvent:| keyed by the
   // touch's |identity|.
   scoped_nsobject<NSMutableDictionary> twoFingerGestureTouches_;
 
   // The raw accumulated zoom value and the actual zoom increments made for an
   // an in-progress pinch gesture.
   CGFloat totalMagnifyGestureAmount_;
   NSInteger currentZoomStepDelta_;
 
-  // The view that shows the incognito badge or the multi-profile avatar icon.
-  // Nil if neither is present. Needed to access the view to move it to/from the
-  // fullscreen window.
-  scoped_nsobject<AvatarButton> avatarButton_;
+  // The view controller that manages the incognito badge or the multi-profile
+  // avatar icon. The view is always in the view hierarchy, but will be hidden
+  // unless it's appropriate to show it.
+  scoped_nsobject<AvatarButtonController> avatarButtonController_;
 
   // The view that shows the presentation mode toggle when in Lion fullscreen
   // mode.  Nil if not in fullscreen mode or not on Lion.
   scoped_nsobject<NSButton> presentationModeToggleButton_;
 
   // Lazily created view which draws the background for the floating set of bars
   // in presentation mode (for window types having a floating bar; it remains
   // nil for those which don't).
   scoped_nsobject<NSView> floatingBarBackingView_;
 
@@ skipping 318 matching lines @@
 - (void)resetWindowGrowthState;
 
 // Computes by how far in each direction, horizontal and vertical, the
 // |source| rect doesn't fit into |target|.
 - (NSSize)overflowFrom:(NSRect)source
                     to:(NSRect)target;
 @end  // @interface BrowserWindowController (TestingAPI)
 
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_