Update avatar button to MD (part 1)

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..c4989696d466be215e01eddd23d44f749fdeea2b 100644
--- a/chrome/browser/ui/views/profiles/new_avatar_button.h
+++ b/chrome/browser/ui/views/profiles/new_avatar_button.h
@@ -9,28 +9,36 @@
 #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/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,

[Evan Stade, 2017/04/27 17:15:02]

does this really need to be a menu button? what is the advantage?

[emx, 2017/04/28 12:39:40]

MenuButton takes care of the ink drop animation on click, highlighting the
button on hover and on press and makes it easy to keep the button in the
"pressed" state while the menu is showing (though I've removed that part from
this CL, as requested).

[Evan Stade, 2017/04/28 18:38:29]

I believe all of the things you've described are also easy with a LabelButton,
except the keep-it-pressed part, which won't be added back in the form you had
it before. SetInkDropMode etc. all work on LabelButtons.

[emx, 2017/05/02 15:17:11]

I forgot to say: AvatarButton used to override OnMousePressed, OnMouseReleased
and OnGestureEvent to make sure that we don't show the bubble again if the user
clicks the button when it's already showing. MenuButton does this. It seems like
exactly what the avatar button is - a button that shows a menu. Is there a
downside to using it?

[Evan Stade, 2017/05/02 15:49:20]

I don't know if that's what the avatar button is or not. Which one is it most
like?

- bookmark star/bubble, page icon/OIB, etc. These show bubbles on mouse release.
- bookmark bar folder. This shows the dropdown on mouse release. 
- app menu. This shows a menu on mouse press.

I think you could make an argument either way. With this change, can you press
the mouse, move the mouse down over a row, and release, and have it activate the
row? To me that's a crucial interaction pattern for something that's considered
a menu.

+                     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 set_generic_avatar(const gfx::ImageSkia& generic_avatar) {
+    generic_avatar_ = generic_avatar;
+  }
 
  private:
   friend class ProfileChooserViewExtensionsTest;
@@ -47,9 +55,7 @@ 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);
 
   AvatarButtonDelegate* delegate_;
   AvatarButtonErrorController error_controller_;
@@ -59,12 +65,54 @@ 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;
+  // Sets generic_avatar_ to the image with the specified IDR.
+  void SetButtonAvatar(int avatar_idr);
 
   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_