[Mac] Redesign of the avatar menu button

chrome/browser/ui/cocoa/browser_window_controller.h

Index: chrome/browser/ui/cocoa/browser_window_controller.h
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index 28ee5f71ed9bfaef7ae6ef3211b6c68ce4026f6f..c1b15df8e51967a687cb9a9e97782cab50fdfd7b 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -25,7 +25,7 @@
 #import "chrome/browser/ui/cocoa/view_resizer.h"
 #include "ui/gfx/rect.h"
 
-@class AvatarButtonController;
+@class AvatarBaseController;
 class Browser;
 class BrowserWindow;
 class BrowserWindowCocoa;
@@ -104,9 +104,13 @@ class WebContents;
   NSInteger currentZoomStepDelta_;
 
   // 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.
-  base::scoped_nsobject<AvatarButtonController> avatarButtonController_;
+  // avatar button. Depending on whether the --new-profile-management flag is
+  // used, the multi-profile button can either be the avatar's icon badge or a
+  // button with the profile's name. If the flag is used, the button is always
+  // shown, otherwise the view will always be in the view hierarchy but will
+  // be hidden unless it's appropriate to show it (i.e. if there's more than
+  // one profile).
+  base::scoped_nsobject<AvatarBaseController> avatarButtonController_;
 
   // 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
@@ -222,7 +226,7 @@ class WebContents;
 - (Profile*)profile;
 
 // Access the avatar button controller.
-- (AvatarButtonController*)avatarButtonController;
+- (AvatarBaseController*)avatarButtonController;
 
 // Forces the toolbar (and transitively the location bar) to update its current
 // state.  If |tab| is non-NULL, we're switching (back?) to this tab and should
@@ -264,6 +268,9 @@ class WebContents;
 // user's profile avatar.
 - (BOOL)shouldShowAvatar;
 
+// Whether or not to show the new avatar button used by --new-profile-maagement.
+- (BOOL)shouldUseNewAvatarButton;
+
 - (BOOL)isBookmarkBarVisible;
 
 // Returns YES if the bookmark bar is currently animating.