[Mac] Redesign of the avatar menu button

chrome/browser/ui/cocoa/browser_window_controller.h

 // Copyright (c) 2012 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_
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
 // code. Each window has a single toolbar and, by virtue of being a
 // TabWindowController, a tab strip along the top.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/browser_command_executor.h"
 #import "chrome/browser/ui/cocoa/fullscreen_exit_bubble_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 AvatarButtonController;
+@class NewAvatarButtonController;
 class Browser;
 class BrowserWindow;
 class BrowserWindowCocoa;
 @class DevToolsController;
 @class DownloadShelfController;
 class ExtensionKeybindingRegistryCocoa;
 @class FindBarCocoaController;
 @class FullscreenModeController;
 @class FullscreenWindow;
 @class InfoBarContainerController;
@@ skipping 62 matching lines @@
   // The raw accumulated zoom value and the actual zoom increments made for an
   // an in-progress pinch gesture.
   CGFloat totalMagnifyGestureAmount_;
   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_;
 
+  // The view controller that manages the new multi-profile avatar button.
+  // It is always shown, except for incognito profiles, in which case the
+  // incognito badge is shown.
+  base::scoped_nsobject<NewAvatarButtonController> newAvatarButtonController_;
+
   // 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).
   base::scoped_nsobject<NSView> floatingBarBackingView_;
 
   // The borderless window used in fullscreen mode.  Lion reuses the original
   // window in fullscreen mode, so this is always nil on Lion.
   base::scoped_nsobject<NSWindow> fullscreenWindow_;
 
   // Tracks whether presentation mode was entered from fullscreen mode or
@@ skipping 96 matching lines @@
 
 // Returns a weak pointer to the overlayable contents controller.
 - (OverlayableContentsController*)overlayableContentsController;
 
 // Access the Profile object that backs this Browser.
 - (Profile*)profile;
 
 // Access the avatar button controller.
 - (AvatarButtonController*)avatarButtonController;
 
+- (NewAvatarButtonController*)newAvatarButtonController;
+
 // 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
 // restore any previous location bar state (such as user editing) as well.
 - (void)updateToolbarWithContents:(content::WebContents*)tab;
 
 // Sets whether or not the current page in the frontmost tab is bookmarked.
 - (void)setStarredState:(BOOL)isStarred;
 
 // Happens when the zoom level is changed in the active tab, the active tab is
 // changed, or a new browser window or tab is created. |canShowBubble| denotes
@@ skipping 20 matching lines @@
 
 // Returns the frame of the regular (non-fullscreened) window (even if the
 // window is currently in fullscreen mode).  The frame is returned in Cocoa
 // coordinates (origin in bottom-left).
 - (NSRect)regularWindowFrame;
 
 // Whether or not to show the avatar, which is either the incognito guy or the
 // user's profile avatar.
 - (BOOL)shouldShowAvatar;
 
+// Whether or not to show the new avatar button used by --new-profile-maagement.

[Nico, 2014/01/07 23:20:33]

typo maagement

Why is this behind a flag? Can it just become the new look? Why keep the old
thing around?

[noms (inactive), 2014/01/08 15:05:31]

This isn't ready to become the new look immediately. It's part of the massive
new avatar menu/button redesign (the bubble has changed too), and I think they
all need to go in at once for this to make sense.

On 2014/01/07 23:20:33, Nico wrote:

+- (BOOL)shouldUseNewAvatarButton;
+
 - (BOOL)isBookmarkBarVisible;
 
 // Returns YES if the bookmark bar is currently animating.
 - (BOOL)isBookmarkBarAnimating;
 
 - (BookmarkBarController*)bookmarkBarController;
 
 - (DevToolsController*)devToolsController;
 
 - (BOOL)isDownloadShelfVisible;
@@ skipping 219 matching lines @@
 // positioned relative to.
 - (NSRect)omniboxPopupAnchorRect;
 
 // Force a layout of info bars.
 - (void)layoutInfoBars;
 
 @end  // @interface BrowserWindowController (TestingAPI)
 
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_