Update avatar button to MD

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

Index: chrome/browser/ui/views/frame/avatar_button_manager.h
diff --git a/chrome/browser/ui/views/frame/avatar_button_manager.h b/chrome/browser/ui/views/frame/avatar_button_manager.h
index ca3aa5bdf0cd895fb93f0f53f55adc94ac0071ee..5bbe9f36ef2ff2fe43b317f2ea4a28880edc50e1 100644
--- a/chrome/browser/ui/views/frame/avatar_button_manager.h
+++ b/chrome/browser/ui/views/frame/avatar_button_manager.h
@@ -7,6 +7,8 @@
 
 #include "chrome/browser/ui/views/profiles/avatar_button_delegate.h"
 #include "chrome/browser/ui/views/profiles/avatar_button_style.h"

[Peter Kasting, 2017/04/26 02:09:53]

Nit: Seems like you could forward-declare AvatarButton instead.

+#include "chrome/browser/ui/views/profiles/new_avatar_button.h"
+#include "ui/views/controls/button/menu_button.h"

[Peter Kasting, 2017/04/26 02:09:53]

Nit: Seems like you shouldn't need this (we should have the necessary prototype
from our superclass).

[emx, 2017/04/27 16:30:58]

Done.

 
 class BrowserNonClientFrameView;
 
@@ -20,21 +22,22 @@ class AvatarButtonManager : public AvatarButtonDelegate {
   // properties.
   void Update(AvatarButtonStyle style);
 
-  // Gets the avatar button as a view::View.
-  views::View* view() const { return view_; }
+  AvatarButton* button() const { return button_; }

[Peter Kasting, 2017/04/26 02:09:53]

Const methods should not return non-const pointers; make method non-const or
pointer const.

 
- private:
   // AvatarButtonDelegate:
   void ButtonPreferredSizeChanged() override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+ private:
+  // views::MenuButtonListener:

[Peter Kasting, 2017/04/26 02:09:53]

Nit: You don't directly inherit from AvatarButtonDelegate, so prefer to label
this as coming from that.

Per recent discussion on chromium-dev, overrides should match the visibility of
their parent, so this function should probably be public.

[emx, 2017/04/27 16:30:58]

Done.

+  void OnMenuButtonClicked(views::MenuButton* source,
+                           const gfx::Point& point,
+                           const ui::Event* event) override;
 
   BrowserNonClientFrameView* frame_view_;  // Weak. Owns |this|.
 
   // Menu button that displays the name of the active or guest profile.
   // May be null and will not be displayed for off the record profiles.
-  views::View* view_;  // Owned by views hierarchy.
+  AvatarButton* button_;  // Owned by views hierarchy.
 
   DISALLOW_COPY_AND_ASSIGN(AvatarButtonManager);
 };