Remove ButtonListener references from c/b/ui/views/.

Bug: 772945
Change-Id: I4533a53a4a7392c7df43bb6f692ed6fd64a8b065
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2487695
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819085}

chrome/browser/ui/views/bubble_menu_item_factory.cc

@@ -49,24 +49,6 @@ std::unique_ptr<views::LabelButton> CreateBubbleMenuItem(
   return button;
 }
 
-std::unique_ptr<views::LabelButton> CreateBubbleMenuItem(
-    int button_id,
-    const base::string16& name,
-    views::ButtonListener* listener) {
-  auto button = std::make_unique<views::LabelButton>(
-      listener, name, views::style::CONTEXT_BUTTON);
-
-  ConfigureBubbleMenuItem(button.get(), button_id);
-
-  button->SetButtonController(std::make_unique<HoverButtonController>(
-      button.get(), views::Button::PressedCallback(listener, button.get()),
-      std::make_unique<views::Button::DefaultButtonControllerDelegate>(
-          button.get())));
-  button->SetBorder(views::CreateEmptyBorder(kDefaultBorderInsets));
-
-  return button;
-}
-
 std::unique_ptr<views::ImageButton> CreateBubbleMenuItem(
     int button_id,
     views::Button::PressedCallback callback) {
@@ -74,11 +56,3 @@ std::unique_ptr<views::ImageButton> CreateBubbleMenuItem(
   ConfigureBubbleMenuItem(button.get(), button_id);
   return button;
 }
-
-std::unique_ptr<views::ImageButton> CreateBubbleMenuItem(
-    int button_id,
-    views::ButtonListener* listener) {
-  auto button = views::CreateVectorImageButton(listener);
-  ConfigureBubbleMenuItem(button.get(), button_id);
-  return button;
-}

chrome/browser/ui/views/bubble_menu_item_factory.h

@@ -24,17 +24,10 @@ std::unique_ptr<views::LabelButton> CreateBubbleMenuItem(
     int button_id,
     const base::string16& name,
     views::Button::PressedCallback callback);
-std::unique_ptr<views::LabelButton> CreateBubbleMenuItem(
-    int button_id,
-    const base::string16& name,
-    views::ButtonListener* listener);
 
 // Convience method for creating a menu item used inside a bubble with an image.
 std::unique_ptr<views::ImageButton> CreateBubbleMenuItem(
     int id,
     views::Button::PressedCallback callback);
-std::unique_ptr<views::ImageButton> CreateBubbleMenuItem(
-    int id,
-    views::ButtonListener* listener);
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BUBBLE_MENU_ITEM_FACTORY_H_

chrome/browser/ui/views/extensions/extensions_menu_button.h

@@ -44,7 +44,7 @@ class ExtensionsMenuButton : public views::LabelButton,
   }
 
  private:
-  // views::ButtonListener:
+  // views::LabelButton:
   const char* GetClassName() const override;
 
   // ToolbarActionViewDelegateViews:

chrome/browser/ui/views/hover_button.cc

@@ -95,10 +95,6 @@ HoverButton::HoverButton(PressedCallback callback, const base::string16& text)
       views::ButtonController::NotifyAction::kOnRelease);
 }
 
-HoverButton::HoverButton(views::ButtonListener* listener,
-                         const base::string16& text)
-    : HoverButton(PressedCallback(listener, this), text) {}
-
 HoverButton::HoverButton(PressedCallback callback,
                          const gfx::ImageSkia& icon,
                          const base::string16& text)
@@ -106,11 +102,6 @@ HoverButton::HoverButton(PressedCallback callback,
   SetImage(STATE_NORMAL, icon);
 }
 
-HoverButton::HoverButton(views::ButtonListener* listener,
-                         const gfx::ImageSkia& icon,
-                         const base::string16& text)
-    : HoverButton(PressedCallback(listener, this), icon, text) {}
-
 HoverButton::HoverButton(PressedCallback callback,
                          std::unique_ptr<views::View> icon_view,
                          const base::string16& title,
@@ -202,21 +193,6 @@ HoverButton::HoverButton(PressedCallback callback,
   SetBorder(CreateBorderWithVerticalSpacing(0));
 }
 
-HoverButton::HoverButton(views::ButtonListener* listener,
-                         std::unique_ptr<views::View> icon_view,
-                         const base::string16& title,
-                         const base::string16& subtitle,
-                         std::unique_ptr<views::View> secondary_view,
-                         bool resize_row_for_secondary_view,
-                         bool secondary_view_can_process_events)
-    : HoverButton(PressedCallback(listener, this),
-                  std::move(icon_view),
-                  title,
-                  subtitle,
-                  std::move(secondary_view),
-                  resize_row_for_secondary_view,
-                  secondary_view_can_process_events) {}
-
 HoverButton::~HoverButton() = default;
 
 // static

chrome/browser/ui/views/hover_button.h

@@ -37,15 +37,11 @@ class HoverButton : public views::LabelButton {
 
   // Creates a single line hover button with no icon.
   HoverButton(PressedCallback callback, const base::string16& text);
-  HoverButton(views::ButtonListener* listener, const base::string16& text);
 
   // Creates a single line hover button with an icon.
   HoverButton(PressedCallback callback,
               const gfx::ImageSkia& icon,
               const base::string16& text);
-  HoverButton(views::ButtonListener* listener,
-              const gfx::ImageSkia& icon,
-              const base::string16& text);
 
   // Creates a HoverButton with custom subviews. |icon_view| replaces the
   // LabelButton icon, and titles appear on separate rows. An empty |subtitle|
@@ -61,13 +57,6 @@ class HoverButton : public views::LabelButton {
               std::unique_ptr<views::View> secondary_view = nullptr,
               bool resize_row_for_secondary_view = true,
               bool secondary_view_can_process_events = false);
-  HoverButton(views::ButtonListener* listener,
-              std::unique_ptr<views::View> icon_view,
-              const base::string16& title,
-              const base::string16& subtitle = base::string16(),
-              std::unique_ptr<views::View> secondary_view = nullptr,
-              bool resize_row_for_secondary_view = true,
-              bool secondary_view_can_process_events = false);
 
   ~HoverButton() override;
 

chrome/browser/ui/views/hover_button_unittest.cc

@@ -102,8 +102,8 @@ TEST_F(HoverButtonTest, TooltipAndAccessibleName) {
     SCOPED_TRACE(testing::Message() << "Index: " << i << ", expected_tooltip="
                                     << (pair.tooltip ? "true" : "false"));
     auto button = std::make_unique<HoverButton>(
-        nullptr, CreateIcon(), base::ASCIIToUTF16(pair.title),
-        base::ASCIIToUTF16(pair.subtitle));
+        views::Button::PressedCallback(), CreateIcon(),
+        base::ASCIIToUTF16(pair.title), base::ASCIIToUTF16(pair.subtitle));
     button->SetSize(gfx::Size(kButtonWidth, 40));
 
     ui::AXNodeData data;
@@ -132,7 +132,7 @@ TEST_F(HoverButtonTest, CreateButtonWithSubtitleAndIcons) {
   std::unique_ptr<views::View> secondary_icon = CreateIcon();
   views::View* secondary_icon_raw = secondary_icon.get();
 
-  HoverButton button(nullptr, std::move(primary_icon),
+  HoverButton button(views::Button::PressedCallback(), std::move(primary_icon),
                      base::ASCIIToUTF16("Title"),
                      base::ASCIIToUTF16("Subtitle"), std::move(secondary_icon));
   EXPECT_TRUE(button.Contains(primary_icon_raw));

chrome/browser/ui/views/md_text_button_with_down_arrow.cc

@@ -29,10 +29,6 @@ MdTextButtonWithDownArrow::MdTextButtonWithDownArrow(PressedCallback callback,
                                   DISTANCE_DROPDOWN_BUTTON_RIGHT_MARGIN)));
 }
 
-MdTextButtonWithDownArrow::MdTextButtonWithDownArrow(ButtonListener* listener,
-                                                     const base::string16& text)
-    : MdTextButton(PressedCallback(listener, this), text) {}
-
 MdTextButtonWithDownArrow::~MdTextButtonWithDownArrow() = default;
 
 void MdTextButtonWithDownArrow::OnThemeChanged() {

chrome/browser/ui/views/md_text_button_with_down_arrow.h

@@ -11,16 +11,12 @@
 
 namespace views {
 
-class ButtonListener;
-
 // The material design themed text button with a drop arrow displayed on the
 // right side.
 class MdTextButtonWithDownArrow : public MdTextButton {
  public:
   MdTextButtonWithDownArrow(PressedCallback callback,
                             const base::string16& text);
-  MdTextButtonWithDownArrow(ButtonListener* listener,
-                            const base::string16& text);
   ~MdTextButtonWithDownArrow() override;
 
  protected: