Index: chrome/browser/ui/views/frame/browser_non_client_frame_view.h |
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view.h |
index 91a9b0dc951889258aa22e1bb2b822712829b38f..3581d53d15ddd85cb83ee406a509caffa45c766d 100644 |
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.h |
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.h |
@@ -11,6 +11,7 @@ class AvatarLabel; |
class AvatarMenuButton; |
class BrowserFrame; |
class BrowserView; |
+class NewAvatarButton; |
// A specialization of the NonClientFrameView object that provides additional |
// Browser-specific methods. |
@@ -34,6 +35,8 @@ class BrowserNonClientFrameView : public views::NonClientFrameView { |
AvatarMenuButton* avatar_button() const { return avatar_button_; } |
+ NewAvatarButton* new_avatar_button() const { return new_avatar_button_; } |
sky
2013/10/03 23:23:11
This is a bit pattern. Return value here should ma
noms (inactive)
2013/10/07 21:18:15
Eek, I'm not sure I can. This seems to be a patter
sky
2013/10/08 01:56:04
Yes, make a bug for it.
noms (inactive)
2013/10/08 18:21:15
Done.
|
+ |
AvatarLabel* avatar_label() const { return avatar_label_; } |
// Returns the bounds within which the TabStrip should be laid out. |
@@ -61,6 +64,8 @@ class BrowserNonClientFrameView : public views::NonClientFrameView { |
// Updates the title and icon of the avatar button. |
void UpdateAvatarInfo(); |
+ // Updates the title of the avatar button displayed in the caption area. |
sky
2013/10/03 23:23:11
nit: newline betwten 66/67.
noms (inactive)
2013/10/07 21:18:15
Done.
|
+ void UpdateNewStyleAvatarInfo(); |
private: |
// The frame that hosts this view. |
@@ -75,6 +80,10 @@ class BrowserNonClientFrameView : public views::NonClientFrameView { |
// Avatar label that is used for a managed user. |
AvatarLabel* avatar_label_; |
+ |
+ // Menu button that displays the name of the active or guest profile. |
+ // May be NULL and will not be displayed for off the record profiles. |
+ NewAvatarButton* new_avatar_button_; |
}; |
namespace chrome { |