Revert 88683 - Change profile menu button to avatar button

chrome/browser/ui/views/frame/opaque_browser_frame_view.h

 // Copyright (c) 2011 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_OPAQUE_BROWSER_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
 #pragma once
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "views/controls/button/button.h"
 #include "views/window/non_client_view.h"
 
 class BrowserView;
 namespace gfx {
 class Font;
 }
-class AvatarMenuButton;
+class ProfileMenuButton;
+class ProfileMenuModel;
+class ProfileTagView;
 class TabContents;
 namespace views {
 class ImageButton;
 class ImageView;
 }
 
 class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
                                public NotificationObserver,
                                public views::ButtonListener,
                                public TabIconView::TabIconViewModel {
@@ skipping 103 matching lines @@
   // there was one).
   gfx::Rect IconBounds() const;
 
   // Paint various sub-components of this view.  The *FrameBorder() functions
   // also paint the background of the titlebar area, since the top frame border
   // and titlebar background are a contiguous component.
   void PaintRestoredFrameBorder(gfx::Canvas* canvas);
   void PaintMaximizedFrameBorder(gfx::Canvas* canvas);
   void PaintTitleBar(gfx::Canvas* canvas);
   void PaintToolbarBackground(gfx::Canvas* canvas);
+  void PaintOTRAvatar(gfx::Canvas* canvas);
   void PaintRestoredClientEdge(gfx::Canvas* canvas);
 
   // Layout various sub-components of this view.
   void LayoutWindowControls();
   void LayoutTitleBar();
-  void LayoutAvatar();
+  void LayoutOTRAvatar();
+  void LayoutProfileTag();
 
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds(int width, int height) const;
 
   // Receive notifications when the user's Google services user name changes.
   void RegisterLoginNotifications();
 
+  // Returns true if the ProfileButton has been created.
+  bool show_profile_button() const { return profile_button_.get() != NULL; }
+
   // The layout rect of the title, if visible.
   gfx::Rect title_bounds_;
 
-  // The layout rect of the avatar icon, if visible.
-  gfx::Rect avatar_bounds_;
+  // The layout rect of the OTR avatar icon, if visible.
+  gfx::Rect otr_avatar_bounds_;
 
   // Window controls.
   views::ImageButton* minimize_button_;
   views::ImageButton* maximize_button_;
   views::ImageButton* restore_button_;
   views::ImageButton* close_button_;
 
   // The Window icon.
   TabIconView* window_icon_;
 
   // The frame that hosts this view.
   BrowserFrame* frame_;
 
   // The BrowserView hosted within this View.
   BrowserView* browser_view_;
 
   // The bounds of the ClientView.
   gfx::Rect client_view_bounds_;
 
-  // Menu button that displays that either the incognito icon or the profile
-  // icon.
-  scoped_ptr<AvatarMenuButton> avatar_button_;
+  // Menu button that displays user's name and multi-profile menu.
+  scoped_ptr<ProfileMenuButton> profile_button_;
+
+  // Image tag displayed on frame beneath profile_button_.
+  scoped_ptr<ProfileTagView> profile_tag_;
 
   // The Google services user name associated with this BrowserView's profile.
   StringPrefMember username_pref_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_