Update avatar button to MD

chrome/browser/ui/views/profiles/new_avatar_button.h

Index: chrome/browser/ui/views/profiles/new_avatar_button.h
diff --git a/chrome/browser/ui/views/profiles/new_avatar_button.h b/chrome/browser/ui/views/profiles/new_avatar_button.h
index 5cbcb617359b115af693793aa9c098f77ebba766..71350246be10d05358ac32524bbd61f1b2f6a9b8 100644
--- a/chrome/browser/ui/views/profiles/new_avatar_button.h
+++ b/chrome/browser/ui/views/profiles/new_avatar_button.h
@@ -9,28 +9,35 @@
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/ui/avatar_button_error_controller.h"
 #include "chrome/browser/ui/avatar_button_error_controller_delegate.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/avatar_button_style.h"
-#include "ui/views/controls/button/label_button.h"
+#include "ui/views/animation/ink_drop.h"
+#include "ui/views/controls/button/menu_button.h"
 
 class AvatarButtonDelegate;
 class Profile;
 
-// Avatar button that displays the active profile's name in the caption area.
-class NewAvatarButton : public views::LabelButton,
-                        public AvatarButtonErrorControllerDelegate,
-                        public ProfileAttributesStorage::Observer {
+class AvatarButton : public views::MenuButton,
+                     public AvatarButtonErrorControllerDelegate,
+                     public ProfileAttributesStorage::Observer {
  public:
-  NewAvatarButton(AvatarButtonDelegate* delegate,
-                  AvatarButtonStyle button_style,
-                  Profile* profile);
-  ~NewAvatarButton() override;
+  AvatarButton(AvatarButtonDelegate* delegate, Profile* profile);
+  ~AvatarButton() override;
 
-  // Views::LabelButton
-  bool OnMousePressed(const ui::MouseEvent& event) override;
-  void OnMouseReleased(const ui::MouseEvent& event) override;
+  // Update the avatar button height previously calculated by GetPreferredSize,
+  // if needed, now that the button's position is known.
+  virtual void UpdateButtonHeightForPosition(const int button_x,
+                                             int* button_height) const {}
 
-  // Views
-  void OnGestureEvent(ui::GestureEvent* event) override;
+ protected:
+  // MenuButton
+  bool IsTriggerableEvent(const ui::Event& event) override;
+
+  // Called when the profile info cache or signin/sync error has changed, which
+  // means we might have to update the icon/text of the button.
+  void Update();
+
+  void SetButtonFromIdr(const int button_idr);

[msarda, 2017/04/25 08:26:02]

It is not clear what this method does. May I ask you to add a short comment for
it?

 
  private:
   friend class ProfileChooserViewExtensionsTest;
@@ -47,9 +54,9 @@ class NewAvatarButton : public views::LabelButton,
   void OnProfileSupervisedUserIdChanged(
       const base::FilePath& profile_path) override;
 
-  // Called when the profile info cache or signin/sync error has changed, which
-  // means we might have to update the icon/text of the button.
-  void Update();
+  void UpdateButton(bool use_generic_button,
+                    Profile* profile,
+                    AvatarButtonErrorController* error_controller);
 
   AvatarButtonDelegate* delegate_;
   AvatarButtonErrorController error_controller_;
@@ -59,12 +66,52 @@ class NewAvatarButton : public views::LabelButton,
   // Different assets are used depending on the OS version.
   gfx::ImageSkia generic_avatar_;
 
-  // This is used to check if the bubble was showing during the mouse pressed
-  // event. If this is true then the mouse released event is ignored to prevent
-  // the bubble from reshowing.
-  bool suppress_mouse_released_action_;
+  DISALLOW_COPY_AND_ASSIGN(AvatarButton);
+};
+
+// Avatar button that displays the active profile's name in the caption area.
+class NewAvatarButton : public AvatarButton {
+ public:
+  NewAvatarButton(AvatarButtonDelegate* delegate,
+                  AvatarButtonStyle button_style,
+                  Profile* profile);
+  ~NewAvatarButton() override;
+
+ protected:
+  gfx::Size GetPreferredSize() const override;
+
+ private:
+  std::unique_ptr<views::Border> CreateBorder(
+      const int normal_image_set[],
+      const int hot_image_set[],
+      const int pushed_image_set[]) const;
 
   DISALLOW_COPY_AND_ASSIGN(NewAvatarButton);
 };
 
+class MaterialDesignAvatarButton : public AvatarButton {
+ public:
+  MaterialDesignAvatarButton(AvatarButtonDelegate* delegate,
+                             Profile* profile,
+                             BrowserView* browser_view);
+  ~MaterialDesignAvatarButton() override;
+
+  void UpdateButtonHeightForPosition(const int button_x,
+                                     int* button_height) const override;
+
+ protected:
+  gfx::Size GetPreferredSize() const override;
+  std::unique_ptr<views::InkDrop> CreateInkDrop() override;
+  std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
+  std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
+      const override;
+
+ private:
+  std::unique_ptr<views::Border> CreateBorder() const;
+
+  BrowserView* browser_view_;
+
+  DISALLOW_COPY_AND_ASSIGN(MaterialDesignAvatarButton);
+};
+
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_NEW_AVATAR_BUTTON_H_