Redesign of the avatar menu button.

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

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
index 12f6dea27079ebd446296995423eb254d6eb379f..15482b0c4309f90d56a0cbd7e931e72b24773ed2 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h
@@ -9,6 +9,7 @@
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/window/frame_buttons.h"
 
+class NewAvatarButton;
 class OpaqueBrowserFrameViewLayoutDelegate;
 
 namespace views {
@@ -16,6 +17,7 @@ class ImageButton;
 class Label;
 }
 
+

[sky, 2013/10/03 23:23:11]

remove newline.

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

Done.

 // Calculates the position of the widgets in the opaque browser frame view.
 //
 // This is separated out for testing reasons. OpaqueBrowserFrameView has tight
@@ -100,6 +102,7 @@ class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
   void LayoutWindowControls(views::View* host);
   void LayoutTitleBar(views::View* host);
   void LayoutAvatar();
+  void LayoutNewStyleAvatar(views::View* host);
 
   void ConfigureButton(views::View* host,
                        views::FrameButton button_id,
@@ -167,6 +170,7 @@ class OpaqueBrowserFrameViewLayout : public views::LayoutManager {
 
   views::View* avatar_label_;
   views::View* avatar_button_;
+  NewAvatarButton* new_avatar_button_;
 
   std::vector<views::FrameButton> leading_buttons_;
   std::vector<views::FrameButton> trailing_buttons_;