Redesign of the avatar menu button.

chrome/browser/ui/views/frame/browser_non_client_frame_view.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_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
 
 #include "ui/views/window/non_client_view.h"
 
 class AvatarLabel;
 class AvatarMenuButton;
 class BrowserFrame;
 class BrowserView;
+class NewAvatarButton;
 
 // A specialization of the NonClientFrameView object that provides additional
 // Browser-specific methods.
 class BrowserNonClientFrameView : public views::NonClientFrameView {
  public:
   // Insets around the tabstrip.
   struct TabStripInsets {
     TabStripInsets() : top(0), left(0), right(0) {}
     TabStripInsets(int top, int left, int right)
         : top(top),
           left(left),
           right(right) {}
 
     int top;
     int left;
     int right;
   };
 
   BrowserNonClientFrameView(BrowserFrame* frame, BrowserView* browser_view);
   virtual ~BrowserNonClientFrameView();
 
   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 match const, or don't make it
const. Eg one (or both) of:

const NewAvatarButton* new_avatar_button() const
NewAvatarButton* new_avatar_button()

Otherwise you can easily circumvent constness.

[noms (inactive), 2013/10/07 21:18:15]

Eek, I'm not sure I can. This seems to be a pattern used everywhere in this
class. If I make it return a const NewAvatarButton*, then
GlassBrowserFrameView::LayoutNewStyleAvatar is grumpy because it needs to call
SetBounds on the button.

If I drop the const on the function, then all the const functions in
GlassBrowserFrameView calling new_avatar_button() don't like it because it's not
const. :(

I think that fixing this instance might require a lot of adding consts or
dropping consts to GlassBrowserFrame. Should I make a bug out of it?

On 2013/10/03 23:23:11, sky wrote:

[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.
   virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const = 0;
 
   // Returns the TabStripInsets within the window at which the tab strip is
   // positioned. If |as_restored| is true, this is calculated as if we were in
   // restored mode regardless of the current mode.
   virtual TabStripInsets GetTabStripInsets(bool force_restored) const = 0;
 
   // Returns the amount that the theme background should be inset.
   virtual int GetThemeBackgroundXInset() const = 0;
 
   // Updates the throbber.
   virtual void UpdateThrobber(bool running) = 0;
 
   // Overriden from views::View.
   virtual void VisibilityChanged(views::View* starting_from,
                                  bool is_visible) OVERRIDE;
   virtual void OnThemeChanged() OVERRIDE;
 
  protected:
   BrowserView* browser_view() const { return browser_view_; }
   BrowserFrame* frame() const { return frame_; }
 
   // 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.
   BrowserFrame* frame_;
 
   // The BrowserView hosted within this View.
   BrowserView* browser_view_;
 
   // Menu button that displays that either the incognito icon or the profile
   // icon.  May be NULL for some frame styles.
   AvatarMenuButton* avatar_button_;
 
   // 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 {
 
 // Provided by a browser_non_client_frame_view_factory_*.cc implementation
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     BrowserFrame* frame, BrowserView* browser_view);
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_