Change ButtonPressed overrides to callbacks: weblayer/

Bug: 772945
Change-Id: I225930af5f4d6c8974ca0c151281565c5e587539
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2485434
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818506}

weblayer/shell/browser/shell_views.cc

@@ -49,8 +49,7 @@ namespace {
 
 // Maintain the UI controls and web view for web shell
 class ShellWindowDelegateView : public views::WidgetDelegateView,
-                                public views::TextfieldController,
-                                public views::ButtonListener {
+                                public views::TextfieldController {
  public:
   enum UIControl { BACK_BUTTON, FORWARD_BUTTON, STOP_BUTTON };
 
@@ -136,8 +135,10 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
 
     views::ColumnSet* toolbar_column_set = toolbar_layout->AddColumnSet(0);
     // Back button
-    auto back_button =
-        std::make_unique<views::MdTextButton>(this, base::ASCIIToUTF16("Back"));
+    auto back_button = std::make_unique<views::MdTextButton>(
+        base::BindRepeating(&Shell::GoBackOrForward,
+                            base::Unretained(shell_.get()), -1),
+        base::ASCIIToUTF16("Back"));
     gfx::Size back_button_size = back_button->GetPreferredSize();
     toolbar_column_set->AddColumn(
         views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
@@ -145,7 +146,9 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
         back_button_size.width() / 2);
     // Forward button
     auto forward_button = std::make_unique<views::MdTextButton>(
-        this, base::ASCIIToUTF16("Forward"));
+        base::BindRepeating(&Shell::GoBackOrForward,
+                            base::Unretained(shell_.get()), 1),
+        base::ASCIIToUTF16("Forward"));
     gfx::Size forward_button_size = forward_button->GetPreferredSize();
     toolbar_column_set->AddColumn(
         views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
@@ -153,7 +156,8 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
         forward_button_size.width() / 2);
     // Refresh button
     auto refresh_button = std::make_unique<views::MdTextButton>(
-        this, base::ASCIIToUTF16("Refresh"));
+        base::BindRepeating(&Shell::Reload, base::Unretained(shell_.get())),
+        base::ASCIIToUTF16("Refresh"));
     gfx::Size refresh_button_size = refresh_button->GetPreferredSize();
     toolbar_column_set->AddColumn(
         views::GridLayout::CENTER, views::GridLayout::CENTER, 0,
@@ -161,7 +165,8 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
         refresh_button_size.width() / 2);
     // Stop button
     auto stop_button = std::make_unique<views::MdTextButton>(
-        this, base::ASCIIToUTF16("Stop (100%)"));
+        base::BindRepeating(&Shell::Stop, base::Unretained(shell_.get())),
+        base::ASCIIToUTF16("Stop (100%)"));
     int stop_button_width = stop_button->GetPreferredSize().width();
     toolbar_column_set->AddColumn(views::GridLayout::FILL,
                                   views::GridLayout::CENTER, 0,
@@ -231,18 +236,6 @@ class ShellWindowDelegateView : public views::WidgetDelegateView,
     return false;
   }
 
-  // Overridden from ButtonListener
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
-    if (sender == back_button_)
-      shell_->GoBackOrForward(-1);
-    else if (sender == forward_button_)
-      shell_->GoBackOrForward(1);
-    else if (sender == refresh_button_)
-      shell_->Reload();
-    else if (sender == stop_button_)
-      shell_->Stop();
-  }
-
   // Overridden from WidgetDelegateView
   base::string16 GetWindowTitle() const override { return title_; }