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..50f8e3ea95d6b1439aac5a77d37b404da61b7976 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller.h |
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h |
@@ -26,6 +26,7 @@ |
#include "ui/gfx/rect.h" |
@class AvatarButtonController; |
+@class NewAvatarButtonController; |
class Browser; |
class BrowserWindow; |
class BrowserWindowCocoa; |
@@ -108,6 +109,11 @@ class WebContents; |
// 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). |
@@ -224,6 +230,8 @@ class WebContents; |
// 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. |
@@ -264,6 +272,9 @@ class WebContents; |
// 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
noms (inactive)
2014/01/08 15:05:31
This isn't ready to become the new look immediatel
|
+- (BOOL)shouldUseNewAvatarButton; |
+ |
- (BOOL)isBookmarkBarVisible; |
// Returns YES if the bookmark bar is currently animating. |