Change ButtonPressed overrides to callbacks: c/b/ui/views/status_icons/

Bug: 772945
Change-Id: I5729038963db819ab639cc105ae7d6272eb3ea8d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472436
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817277}

chrome/browser/ui/views/status_icons/status_icon_button_linux.cc

@@ -31,7 +31,10 @@ class StatusIconWidget : public views::Widget {
 
 }  // namespace
 
-StatusIconButtonLinux::StatusIconButtonLinux() : Button(this) {}
+StatusIconButtonLinux::StatusIconButtonLinux()
+    : Button(base::BindRepeating(
+          [](StatusIconButtonLinux* button) { button->delegate_->OnClick(); },
+          base::Unretained(this))) {}
 
 StatusIconButtonLinux::~StatusIconButtonLinux() = default;
 
@@ -103,11 +106,6 @@ void StatusIconButtonLinux::ShowContextMenuForViewImpl(
                           views::MenuAnchorPosition::kTopLeft, source_type);
 }
 
-void StatusIconButtonLinux::ButtonPressed(Button* sender,
-                                          const ui::Event& event) {
-  delegate_->OnClick();
-}
-
 void StatusIconButtonLinux::PaintButtonContents(gfx::Canvas* canvas) {
   gfx::ScopedCanvas scoped_canvas(canvas);
   canvas->UndoDeviceScaleFactor();
@@ -132,4 +130,4 @@ void StatusIconButtonLinux::PaintButtonContents(gfx::Canvas* canvas) {
   flags.setFilterQuality(kHigh_SkFilterQuality);
   canvas->DrawImageInt(image, 0, 0, image.width(), image.height(), 0, 0,
                        image.width(), image.height(), true, flags);
-}
+}
\ No newline at end of file

chrome/browser/ui/views/status_icons/status_icon_button_linux.h

@@ -23,8 +23,7 @@ class WindowTreeHost;
 // OnImplInitializationFailed.
 class StatusIconButtonLinux : public views::StatusIconLinux,
                               public views::Button,
-                              public views::ContextMenuController,
-                              public views::ButtonListener {
+                              public views::ContextMenuController {
  public:
   StatusIconButtonLinux();
   ~StatusIconButtonLinux() override;
@@ -40,9 +39,6 @@ class StatusIconButtonLinux : public views::StatusIconLinux,
                                   const gfx::Point& point,
                                   ui::MenuSourceType source_type) override;
 
-  // views::ButtonListener:
-  void ButtonPressed(Button* sender, const ui::Event& event) override;
-
   // views::Button:
   void PaintButtonContents(gfx::Canvas* canvas) override;