Change profile menu button to avatar button

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

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.h
===================================================================
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h	(revision 88686)
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h	(working copy)
@@ -18,9 +18,7 @@
 namespace gfx {
 class Font;
 }
-class ProfileMenuButton;
-class ProfileMenuModel;
-class ProfileTagView;
+class AvatarMenuButton;
 class TabContents;
 namespace views {
 class ImageButton;
@@ -144,14 +142,12 @@
   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 LayoutOTRAvatar();
-  void LayoutProfileTag();
+  void LayoutAvatar();
 
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds(int width, int height) const;
@@ -159,14 +155,11 @@
   // 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 OTR avatar icon, if visible.
-  gfx::Rect otr_avatar_bounds_;
+  // The layout rect of the avatar icon, if visible.
+  gfx::Rect avatar_bounds_;
 
   // Window controls.
   views::ImageButton* minimize_button_;
@@ -186,12 +179,10 @@
   // The bounds of the ClientView.
   gfx::Rect client_view_bounds_;
 
-  // Menu button that displays user's name and multi-profile menu.
-  scoped_ptr<ProfileMenuButton> profile_button_;
+  // Menu button that displays that either the incognito icon or the profile
+  // icon.
+  scoped_ptr<AvatarMenuButton> avatar_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_;