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

Bug: 772945
Change-Id: I70086bea566951bf153eee521e2ec76102470dfa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469440
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Daniel Rubery <drubery@chromium.org>
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818054}

chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog.cc

@@ -44,9 +44,15 @@ DeepScanningFailureModalDialog::DeepScanningFailureModalDialog(
                      IDS_DEEP_SCANNING_TIMED_OUT_DIALOG_CANCEL_BUTTON));
   SetAcceptCallback(std::move(accept_callback));
   SetCancelCallback(std::move(cancel_callback));
-  open_now_button_ = SetExtraView(std::make_unique<views::MdTextButton>(
-      this, l10n_util::GetStringUTF16(
-                IDS_DEEP_SCANNING_INFO_DIALOG_OPEN_NOW_BUTTON)));
+  SetExtraView(std::make_unique<views::MdTextButton>(
+      base::BindRepeating(
+          [](DeepScanningFailureModalDialog* dialog) {
+            std::move(dialog->open_now_callback_).Run();
+            dialog->CancelDialog();
+          },
+          base::Unretained(this)),
+      l10n_util::GetStringUTF16(
+          IDS_DEEP_SCANNING_INFO_DIALOG_OPEN_NOW_BUTTON)));
 
   set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
       views::TEXT, views::TEXT));
@@ -86,12 +92,4 @@ ui::ModalType DeepScanningFailureModalDialog::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
-void DeepScanningFailureModalDialog::ButtonPressed(views::Button* sender,
-                                                   const ui::Event& event) {
-  if (sender == open_now_button_) {
-    std::move(open_now_callback_).Run();
-    CancelDialog();
-  }
-}
-
 }  // namespace safe_browsing

chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog.h

@@ -20,8 +20,7 @@ namespace safe_browsing {
 
 // A tab modal dialog that provides more information to the user about the
 // prompt for deep scanning.
-class DeepScanningFailureModalDialog : public views::DialogDelegateView,
-                                       public views::ButtonListener {
+class DeepScanningFailureModalDialog : public views::DialogDelegateView {
  public:
   // Show this dialog for the given |web_contents|.
   static void ShowForWebContents(content::WebContents* web_contents,
@@ -47,15 +46,7 @@ class DeepScanningFailureModalDialog : public views::DialogDelegateView,
   // views::WidgetDelegate implementation:
   ui::ModalType GetModalType() const override;
 
-  // views::ButtonListener implementation:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
  private:
-  // The open now button for this dialog. The pointer is unowned, but this is a
-  // child View of this dialog's View, so it has the same lifetime.
-  views::Button* open_now_button_;
-
-  // The callbacks to trigger on each way the dialog is resolved.
   base::OnceClosure open_now_callback_;
 };
 

chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.cc

@@ -43,8 +43,7 @@ PromptForScanningModalDialog::PromptForScanningModalDialog(
     content::WebContents* web_contents,
     const base::string16& filename,
     base::OnceClosure accept_callback,
-    base::OnceClosure open_now_callback)
-    : filename_(filename), open_now_callback_(std::move(open_now_callback)) {
+    base::OnceClosure open_now_callback) {
   SetTitle(IDS_DEEP_SCANNING_INFO_DIALOG_TITLE);
   SetButtonLabel(
       ui::DIALOG_BUTTON_OK,
@@ -53,9 +52,15 @@ PromptForScanningModalDialog::PromptForScanningModalDialog(
       ui::DIALOG_BUTTON_CANCEL,
       l10n_util::GetStringUTF16(IDS_DEEP_SCANNING_INFO_DIALOG_CANCEL_BUTTON));
   SetAcceptCallback(std::move(accept_callback));
-  open_now_button_ = SetExtraView(std::make_unique<views::MdTextButton>(
-      this, l10n_util::GetStringUTF16(
-                IDS_DEEP_SCANNING_INFO_DIALOG_OPEN_NOW_BUTTON)));
+  SetExtraView(std::make_unique<views::MdTextButton>(
+      base::BindRepeating(
+          [](PromptForScanningModalDialog* dialog) {
+            std::move(dialog->open_now_callback_).Run();
+            dialog->CancelDialog();
+          },
+          base::Unretained(this)),
+      l10n_util::GetStringUTF16(
+          IDS_DEEP_SCANNING_INFO_DIALOG_OPEN_NOW_BUTTON)));
 
   set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
       views::TEXT, views::TEXT));
@@ -74,7 +79,7 @@ PromptForScanningModalDialog::PromptForScanningModalDialog(
   base::string16 message_text = base::ReplaceStringPlaceholders(
       base::ASCIIToUTF16("$1 $2"),
       {l10n_util::GetStringFUTF16(IDS_DEEP_SCANNING_INFO_DIALOG_MESSAGE,
-                                  filename_),
+                                  filename),
        l10n_util::GetStringUTF16(IDS_LEARN_MORE)},
       &offsets);
 
@@ -117,12 +122,4 @@ ui::ModalType PromptForScanningModalDialog::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
-void PromptForScanningModalDialog::ButtonPressed(views::Button* sender,
-                                                 const ui::Event& event) {
-  if (sender == open_now_button_) {
-    std::move(open_now_callback_).Run();
-    CancelDialog();
-  }
-}
-
 }  // namespace safe_browsing

chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.h

@@ -9,7 +9,6 @@
 #include "base/callback_forward.h"
 #include "base/timer/timer.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/window/dialog_delegate.h"
 
@@ -21,8 +20,7 @@ namespace safe_browsing {
 
 // A tab modal dialog that provides more information to the user about the
 // prompt for deep scanning.
-class PromptForScanningModalDialog : public views::DialogDelegateView,
-                                     public views::ButtonListener {
+class PromptForScanningModalDialog : public views::DialogDelegateView {
  public:
   // Show this dialog for the given |web_contents|.
   static void ShowForWebContents(content::WebContents* web_contents,
@@ -48,18 +46,7 @@ class PromptForScanningModalDialog : public views::DialogDelegateView,
   // views::WidgetDelegate implementation:
   ui::ModalType GetModalType() const override;
 
-  // views::ButtonListener implementation:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
  private:
-  // The name of the file that this prompt was created for.
-  base::string16 filename_;
-
-  // The open now button for this dialog. The pointer is unowned, but this is a
-  // child View of this dialog's View, so it has the same lifetime.
-  views::Button* open_now_button_;
-
-  // The callbacks to trigger on each way the dialog is resolved.
   base::OnceClosure open_now_callback_;
 };