Multi-Profiles: Add icon chooser to profiles menu

chrome/browser/ui/views/avatar_menu_button.h

Index: chrome/browser/ui/views/avatar_menu_button.h
diff --git a/chrome/browser/ui/views/avatar_menu_button.h b/chrome/browser/ui/views/avatar_menu_button.h
index 9674995dcc5ad7ac1b906652aa77d109e8d7c1db..00d387dabbb324d286834de104b0458ff13b2950 100644
--- a/chrome/browser/ui/views/avatar_menu_button.h
+++ b/chrome/browser/ui/views/avatar_menu_button.h
@@ -16,6 +16,7 @@
 namespace gfx {
 class Canvas;
 }
+class Browser;
 
 // AvatarMenuButton
 //
@@ -25,18 +26,22 @@ class Canvas;
 class AvatarMenuButton : public views::MenuButton,
                          public views::ViewMenuDelegate {
  public:
-  // Creates a new button. The object will take ownership of the menu model.
-  AvatarMenuButton(const std::wstring& text, ui::MenuModel* menu_model);
+  // Creates a new button. If |has_menu| is truen then clicking on the button

[Miranda Callahan, 2011/07/09 13:24:26]

s/truen/true

[sail, 2011/07/09 17:58:48]

Done.

+  // will cause the profile menu to be displayed.
+  AvatarMenuButton(Browser* browser, bool has_menu);
 
   virtual ~AvatarMenuButton();
 
   // views::MenuButton
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual bool HitTest(const gfx::Point& point) const OVERRIDE;
 
  private:
   // views::ViewMenuDelegate
   virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
 
+  Browser* browser_;
+  bool has_menu_;
   scoped_ptr<ui::MenuModel> menu_model_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarMenuButton);