Extend PressedCallback support to MdTextButton

This removes ButtonListener from BubbleDialogModelHost and adds
Button::PressedCallback versions of MdTextButton and LabelButton
constructors to support it.

Bug: 772945, 1106422
Change-Id: I5a6fc50a714e6ac6701af588d5a428ea291bd008
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398321
Commit-Queue: Peter Boström <pbos@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Auto-Submit: Peter Boström <pbos@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804920}

ui/views/bubble/bubble_dialog_model_host.cc

@@ -89,9 +89,12 @@ BubbleDialogModelHost::BubbleDialogModelHost(
   // OnDialogInitialized() will not work until then.
   auto* extra_button = model_->extra_button(GetPassKey());
   if (extra_button) {
-    OnViewCreatedForField(SetExtraView(std::make_unique<MdTextButton>(
-                              this, extra_button->label(GetPassKey()))),
-                          extra_button);
+    OnViewCreatedForField(
+        SetExtraView(std::make_unique<MdTextButton>(
+            base::BindRepeating(&ui::DialogModelButton::OnPressed,
+                                base::Unretained(extra_button), GetPassKey()),
+            extra_button->label(GetPassKey()))),
+        extra_button);
   }
 
   SetButtons(button_mask);
@@ -329,13 +332,6 @@ void BubbleDialogModelHost::NotifyComboboxSelectedIndexChanged(
       ->OnSelectedIndexChanged(GetPassKey(), combobox->GetSelectedIndex());
 }
 
-void BubbleDialogModelHost::ButtonPressed(Button* sender,
-                                          const ui::Event& event) {
-  view_to_field_[sender]
-      ->AsButton(GetPassKey())
-      ->OnPressed(GetPassKey(), event);
-}
-
 void BubbleDialogModelHost::OnPerformAction(Combobox* combobox) {
   // TODO(pbos): This should be a subscription through the Combobox directly,
   // but Combobox right now doesn't support listening to selected-index changes.

ui/views/bubble/bubble_dialog_model_host.h

@@ -31,7 +31,6 @@ class Textfield;
 // platform-agnostic model-delegate code.
 class VIEWS_EXPORT BubbleDialogModelHost : public BubbleDialogDelegateView,
                                            public ui::DialogModelHost,
-                                           public ButtonListener,
                                            public ComboboxListener {
  public:
   // Constructs a BubbleDialogModelHost, which for most purposes is to used as a
@@ -53,9 +52,6 @@ class VIEWS_EXPORT BubbleDialogModelHost : public BubbleDialogDelegateView,
   void SelectAllText(int unique_id) override;
   void OnFieldAdded(ui::DialogModelField* field) override;
 
-  // ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // ComboboxListener:
   void OnPerformAction(views::Combobox* combobox) override;
 

ui/views/controls/button/button.cc

@@ -480,9 +480,8 @@ void Button::AnimationProgressed(const gfx::Animation* animation) {
   SchedulePaint();
 }
 
-Button::Button(ButtonListener* listener) : Button(PressedCallback()) {
-  set_listener(listener);
-}
+Button::Button(ButtonListener* listener)
+    : Button(ListenerToPressedCallback(this, listener)) {}
 
 Button::Button(PressedCallback callback)
     : AnimationDelegateViews(this),
@@ -496,6 +495,18 @@ Button::Button(PressedCallback callback)
       this, std::make_unique<DefaultButtonControllerDelegate>(this));
 }
 
+Button::PressedCallback Button::ListenerToPressedCallback(
+    Button* button,
+    ButtonListener* listener) {
+  if (!listener)
+    return base::DoNothing();
+  return base::BindRepeating(
+      [](ButtonListener* listener, Button* button, const ui::Event& event) {
+        listener->ButtonPressed(button, event);
+      },
+      listener, button);
+}
+
 void Button::RequestFocusFromEvent() {
   if (request_focus_on_press_)
     RequestFocus();

ui/views/controls/button/button.h

@@ -112,16 +112,7 @@ class VIEWS_EXPORT Button : public InkDropHostView,
 
   // TODO(pbos): Replace uses of this with set_callback().
   void set_listener(ButtonListener* listener) {
-    if (!listener) {
-      set_callback(base::DoNothing());
-      return;
-    }
-
-    set_callback(base::BindRepeating(
-        [](ButtonListener* listener, Button* button, const ui::Event& event) {
-          listener->ButtonPressed(button, event);
-        },
-        listener, this));
+    set_callback(ListenerToPressedCallback(this, listener));
   }
 
   void set_callback(PressedCallback callback) {
@@ -256,6 +247,12 @@ class VIEWS_EXPORT Button : public InkDropHostView,
   explicit Button(ButtonListener* listener = nullptr);
   explicit Button(PressedCallback callback);
 
+  // Wraps a ButtonListener for |button| into a PressedCallback, used during
+  // migration from ButtonListener to PressedCallback to let child classes use
+  // PressedCallback versions of parent constructors.
+  static PressedCallback ListenerToPressedCallback(Button* button,
+                                                   ButtonListener* listener);
+
   // Called when the button has been clicked or tapped and should request focus
   // if necessary.
   virtual void RequestFocusFromEvent();

ui/views/controls/button/label_button.cc

@@ -35,7 +35,14 @@ namespace views {
 LabelButton::LabelButton(ButtonListener* listener,
                          const base::string16& text,
                          int button_context)
-    : Button(listener),
+    : LabelButton(ListenerToPressedCallback(this, listener),
+                  text,
+                  button_context) {}
+
+LabelButton::LabelButton(PressedCallback callback,
+                         const base::string16& text,
+                         int button_context)
+    : Button(std::move(callback)),
       cached_normal_font_list_(
           style::GetFont(button_context, style::STYLE_PRIMARY)),
       cached_default_button_font_list_(

ui/views/controls/button/label_button.h

@@ -33,12 +33,17 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
  public:
   METADATA_HEADER(LabelButton);
 
-  // Creates a LabelButton with ButtonPressed() events sent to |listener| and
-  // label |text|. |button_context| is a value from views::style::TextContext
-  // and determines the appearance of |text|.
+  // TODO(pbos): Replace with uses of PressedCallback version below.
   explicit LabelButton(ButtonListener* listener = nullptr,
                        const base::string16& text = base::string16(),
                        int button_context = style::CONTEXT_BUTTON);
+  // Creates a LabelButton with pressed events sent to |callback| and label
+  // |text|. |button_context| is a value from views::style::TextContext and
+  // determines the appearance of |text|.
+  explicit LabelButton(PressedCallback callback,
+                       const base::string16& text = base::string16(),
+                       int button_context = style::CONTEXT_BUTTON);
+
   ~LabelButton() override;
 
   // Gets or sets the image shown for the specified button state.

ui/views/controls/button/md_text_button.cc

@@ -33,7 +33,14 @@ namespace views {
 MdTextButton::MdTextButton(ButtonListener* listener,
                            const base::string16& text,
                            int button_context)
-    : LabelButton(listener, text, button_context) {
+    : MdTextButton(ListenerToPressedCallback(this, listener),
+                   text,
+                   button_context) {}
+
+MdTextButton::MdTextButton(PressedCallback callback,
+                           const base::string16& text,
+                           int button_context)
+    : LabelButton(std::move(callback), text, button_context) {
   SetInkDropMode(InkDropMode::ON);
   set_has_ink_drop_action_on_click(true);
   set_show_ink_drop_when_hot_tracked(true);

ui/views/controls/button/md_text_button.h

@@ -19,10 +19,13 @@ class VIEWS_EXPORT MdTextButton : public LabelButton {
  public:
   METADATA_HEADER(MdTextButton);
 
+  // TODO(pbos): Replace uses of this with PressedCallback version below.
   explicit MdTextButton(ButtonListener* listener = nullptr,
                         const base::string16& text = base::string16(),
                         int button_context = style::CONTEXT_BUTTON_MD);
-
+  explicit MdTextButton(PressedCallback callback,
+                        const base::string16& text = base::string16(),
+                        int button_context = style::CONTEXT_BUTTON_MD);
   ~MdTextButton() override;
 
   // See |is_prominent_|.