Change ButtonPressed overrides to callbacks: ash/login/

Bug: 772945
Change-Id: I51af3cf1070b81f8458dec3a6e28cb1625944dc2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518711
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824112}

ash/child_accounts/parent_access_controller_impl_unittest.cc

@@ -18,6 +18,7 @@
 #include "components/session_manager/session_manager_types.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/test/button_test_api.h"
 
 namespace ash {
 
@@ -53,7 +54,7 @@ class ParentAccessControllerImplTest : public LoginTestBase {
   void SimulateButtonPress(views::Button* button) {
     ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                          ui::EventTimeForNow(), 0, 0);
-    view_->ButtonPressed(button, event);
+    views::test::ButtonTestApi(button).NotifyClick(event);
   }
 
   // Called when ParentAccessView finished processing.

ash/login/login_screen_test_api.cc

@@ -88,7 +88,7 @@ bool SimulateButtonPressedForTesting(LoginShelfView::ButtonId button_id) {
   if (!button->GetEnabled())
     return false;
 
-  views::test::ButtonTestApi(static_cast<views::Button*>(button))
+  views::test::ButtonTestApi(views::Button::AsButton(button))
       .NotifyClick(ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::PointF(),
                                   gfx::PointF(), base::TimeTicks(), 0, 0));
   return true;
@@ -513,7 +513,10 @@ bool LoginScreenTestApi::ExpandPublicSessionPod(const AccountId& account_id) {
     ADD_FAILURE() << "Arrow button not visible";
     return false;
   }
-  public_account_test.OnArrowTap();
+  views::test::ButtonTestApi(
+      views::Button::AsButton(public_account_test.arrow_button()))
+      .NotifyClick(ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::PointF(),
+                                  gfx::PointF(), base::TimeTicks(), 0, 0));
   return lock_contents_test.expanded_view();
 }
 
@@ -567,7 +570,10 @@ void LoginScreenTestApi::ClickPublicExpandedAdvancedViewButton() {
       lock_screen_test.contents_view());
   LoginExpandedPublicAccountView::TestApi expanded_test(
       lock_contents_test.expanded_view());
-  expanded_test.OnAdvancedButtonTap();
+  views::test::ButtonTestApi(
+      views::Button::AsButton(expanded_test.advanced_view_button()))
+      .NotifyClick(ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::PointF(),
+                                  gfx::PointF(), base::TimeTicks(), 0, 0));
 }
 
 // static
@@ -577,7 +583,10 @@ void LoginScreenTestApi::ClickPublicExpandedSubmitButton() {
       lock_screen_test.contents_view());
   LoginExpandedPublicAccountView::TestApi expanded_test(
       lock_contents_test.expanded_view());
-  expanded_test.OnSubmitButtonTap();
+  views::test::ButtonTestApi(
+      views::Button::AsButton(expanded_test.submit_button()))
+      .NotifyClick(ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::PointF(),
+                                  gfx::PointF(), base::TimeTicks(), 0, 0));
 }
 
 // static

ash/login/security_token_request_controller_unittest.cc

@@ -18,6 +18,7 @@
 #include "ui/events/types/event_type.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/test/button_test_api.h"
 
 namespace ash {
 
@@ -45,7 +46,7 @@ class SecurityTokenRequestControllerTest : public LoginTestBase {
   void SimulateButtonPress(views::Button* button) {
     ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                          ui::EventTimeForNow(), 0, 0);
-    view_->ButtonPressed(button, event);
+    views::test::ButtonTestApi(button).NotifyClick(event);
   }
 
   void StartRequest(int attempts_left = -1) {

ash/login/ui/bottom_status_indicator.cc

@@ -13,7 +13,7 @@
 namespace ash {
 
 BottomStatusIndicator::BottomStatusIndicator(TappedCallback on_tapped_callback)
-    : LabelButton(this), on_tapped_callback_(std::move(on_tapped_callback)) {
+    : LabelButton(std::move(on_tapped_callback)) {
   label()->SetAutoColorReadabilityEnabled(false);
   label()->SetFontList(
       views::Label::GetDefaultFontList().DeriveWithSizeDelta(1));
@@ -34,13 +34,6 @@ void BottomStatusIndicator::SetIcon(const gfx::VectorIcon& vector_icon,
           vector_icon, AshColorProvider::Get()->GetContentLayerColor(type)));
 }
 
-void BottomStatusIndicator::ButtonPressed(views::Button* sender,
-                                          const ui::Event& event) {
-  DCHECK(sender == this);
-  DCHECK(on_tapped_callback_);
-  on_tapped_callback_.Run();
-}
-
 void BottomStatusIndicator::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->role = role_;
   node_data->SetName(label()->GetText());

ash/login/ui/bottom_status_indicator.h

@@ -17,8 +17,7 @@ struct VectorIcon;
 
 namespace ash {
 
-class BottomStatusIndicator : public views::LabelButton,
-                              public views::ButtonListener {
+class BottomStatusIndicator : public views::LabelButton {
  public:
   using TappedCallback = base::RepeatingClosure;
 
@@ -32,14 +31,10 @@ class BottomStatusIndicator : public views::LabelButton,
 
   void set_role_for_accessibility(ax::mojom::Role role) { role_ = role; }
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // views::View:
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
  private:
-  TappedCallback on_tapped_callback_;
   ax::mojom::Role role_ = ax::mojom::Role::kStaticText;
 };
 

ash/login/ui/lock_contents_view.cc

@@ -362,21 +362,13 @@ class UserAddingScreenIndicator : public views::View {
 
 }  // namespace
 
-class LockContentsView::AuthErrorBubble : public LoginErrorBubble,
-                                          public views::ButtonListener {
+class LockContentsView::AuthErrorBubble : public LoginErrorBubble {
  public:
   AuthErrorBubble() {
     set_positioning_strategy(PositioningStrategy::kTryAfterThenBefore);
     SetPadding(kHorizontalPaddingAuthErrorBubbleDp,
                kVerticalPaddingAuthErrorBubbleDp);
   }
-
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
-    Shell::Get()->login_screen_controller()->ShowAccountAccessHelpApp(
-        GetWidget()->GetNativeWindow());
-    Hide();
-  }
 };
 
 class LockContentsView::ManagementBubble : public LoginTooltipView {
@@ -2104,7 +2096,9 @@ void LockContentsView::ShowAuthErrorMessage() {
   label->SetAutoColorReadabilityEnabled(false);
 
   auto learn_more_button = std::make_unique<SystemLabelButton>(
-      auth_error_bubble_, l10n_util::GetStringUTF16(IDS_ASH_LEARN_MORE),
+      base::BindRepeating(&LockContentsView::LearnMoreButtonPressed,
+                          base::Unretained(this)),
+      l10n_util::GetStringUTF16(IDS_ASH_LEARN_MORE),
       SystemLabelButton::DisplayType::DEFAULT, /*multiline*/ true);
 
   auto container = std::make_unique<NonAccessibleView>(kAuthErrorContainerName);
@@ -2202,6 +2196,12 @@ void LockContentsView::OnPublicAccountTapped(bool is_primary) {
   SetDisplayStyle(DisplayStyle::kExclusivePublicAccountExpandedView);
 }
 
+void LockContentsView::LearnMoreButtonPressed() {
+  Shell::Get()->login_screen_controller()->ShowAccountAccessHelpApp(
+      GetWidget()->GetNativeWindow());
+  auth_error_bubble_->Hide();
+}
+
 std::unique_ptr<LoginBigUserView> LockContentsView::AllocateLoginBigUserView(
     const LoginUserInfo& user,
     bool is_primary) {

ash/login/ui/lock_contents_view.h

@@ -374,6 +374,8 @@ class ASH_EXPORT LockContentsView
   // Called when the public account is tapped.
   void OnPublicAccountTapped(bool is_primary);
 
+  void LearnMoreButtonPressed();
+
   // Helper method to allocate a LoginBigUserView instance.
   std::unique_ptr<LoginBigUserView> AllocateLoginBigUserView(
       const LoginUserInfo& user,

ash/login/ui/lock_debug_view.h

@@ -28,7 +28,7 @@ enum class TrayActionState;
 }
 
 // Contains the debug UI row (ie, add user, toggle PIN buttons).
-class LockDebugView : public views::View, public views::ButtonListener {
+class LockDebugView : public views::View {
  public:
   LockDebugView(mojom::TrayActionState initial_note_action_state,
                 LockScreen::ScreenType screen_type);
@@ -37,9 +37,6 @@ class LockDebugView : public views::View, public views::ButtonListener {
   // views::View:
   void Layout() override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   LockContentsView* lock() { return lock_; }
 
  private:
@@ -53,7 +50,36 @@ class LockDebugView : public views::View, public views::ButtonListener {
     kDetachableBaseFailed,
   };
 
-  // Cycle through the various types of auth error bubbles that can be shown on
+  // Adds or removes users.
+  void AddOrRemoveUsersButtonPressed(int delta);
+
+  // Iteratively adds more info to the system info labels to test 7 permutations
+  // and then disables the button.
+  void AddSystemInfoButtonPressed();
+
+  // Enables/disables auth. This is useful for testing auth failure scenarios on
+  // Linux Desktop builds, where the cryptohome dbus stub accepts all passwords
+  // as valid.
+  void ToggleAuthButtonPressed();
+
+  void AddKioskAppButtonPressed();
+  void RemoveKioskAppButtonPressed();
+  void ToggleDebugDetachableBaseButtonPressed();
+  void CycleDetachableBaseStatusButtonPressed();
+  void CycleDetachableBaseIdButtonPressed();
+
+  // Shows or hides warning banner.
+  void ToggleWarningBannerButtonPressed();
+
+  void ToggleManagedSessionDisclosureButtonPressed();
+
+  // Updates the last used detachable base.
+  void UseDetachableBaseButtonPressed(int index);
+
+  // Converts this user to regular user or public account.
+  void TogglePublicAccountButtonPressed(int index);
+
+  // Cycles through the various types of auth error bubbles that can be shown on
   // the login screen.
   void CycleAuthErrorMessage();
 
@@ -67,7 +93,7 @@ class LockDebugView : public views::View, public views::ButtonListener {
 
   // Creates a button on the debug row that cannot be focused.
   views::LabelButton* AddButton(const std::string& text,
-                                int id,
+                                views::Button::PressedCallback callback,
                                 views::View* container);
 
   LockContentsView* lock_ = nullptr;
@@ -75,9 +101,12 @@ class LockDebugView : public views::View, public views::ButtonListener {
   // Debug container which holds the entire debug UI.
   views::View* container_ = nullptr;
 
-  // Container which holds global actions. Each child button has an id which can
-  // be used to identify it.
+  // Container which holds global actions.
   views::View* global_action_view_container_ = nullptr;
+
+  // Global add system info button. Reference is needed to dynamically disable.
+  views::LabelButton* global_action_add_system_info_ = nullptr;
+
   // Global toggle auth button. Reference is needed to update the string.
   views::LabelButton* global_action_toggle_auth_ = nullptr;
 

ash/login/ui/lock_screen_media_controls_view.cc

@@ -21,7 +21,6 @@
 #include "components/media_message_center/media_notification_util.h"
 #include "components/vector_icons/vector_icons.h"
 #include "services/media_session/public/cpp/util.h"
-#include "services/media_session/public/mojom/media_session.mojom.h"
 #include "services/media_session/public/mojom/media_session_service.mojom.h"
 #include "ui/accessibility/ax_enums.mojom.h"
 #include "ui/accessibility/ax_node_data.h"
@@ -140,11 +139,20 @@ const gfx::VectorIcon& GetVectorIconForMediaAction(MediaSessionAction action) {
 // MediaActionButton is an image button with a custom ink drop mask.
 class MediaActionButton : public views::ImageButton {
  public:
-  MediaActionButton(views::ButtonListener* listener,
+  MediaActionButton(LockScreenMediaControlsView* view,
                     int icon_size,
                     MediaSessionAction action,
                     const base::string16& accessible_name)
-      : views::ImageButton(listener), icon_size_(icon_size) {
+      : views::ImageButton(base::BindRepeating(
+            // Handle dynamically-updated button tags without rebinding.
+            [](LockScreenMediaControlsView* controls,
+               MediaActionButton* button) {
+              controls->ButtonPressed(
+                  media_message_center::GetActionFromButtonTag(*button));
+            },
+            view,
+            this)),
+        icon_size_(icon_size) {
     SetInkDropMode(views::Button::InkDropMode::ON);
     SetHasInkDropActionOnClick(true);
     SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);
@@ -634,21 +642,6 @@ void LockScreenMediaControlsView::OnImplicitAnimationsCompleted() {
   Dismiss();
 }
 
-void LockScreenMediaControlsView::ButtonPressed(views::Button* sender,
-                                                const ui::Event& event) {
-  if (!base::Contains(enabled_actions_,
-                      media_message_center::GetActionFromButtonTag(*sender)) ||
-      !media_session_id_.has_value()) {
-    return;
-  }
-
-  auto action = media_message_center::GetActionFromButtonTag(*sender);
-
-  base::UmaHistogramEnumeration(kMediaControlsUserActionHistogramName, action);
-
-  media_session::PerformMediaSessionAction(action, media_controller_remote_);
-}
-
 void LockScreenMediaControlsView::OnGestureEvent(ui::GestureEvent* event) {
   gfx::Point point_in_screen = event->location();
   ConvertPointToScreen(this, &point_in_screen);
@@ -687,6 +680,16 @@ void LockScreenMediaControlsView::OnSuspend() {
   Hide(HideReason::kDeviceSleep);
 }
 
+void LockScreenMediaControlsView::ButtonPressed(
+    media_session::mojom::MediaSessionAction action) {
+  if (base::Contains(enabled_actions_, action) &&
+      media_session_id_.has_value()) {
+    base::UmaHistogramEnumeration(kMediaControlsUserActionHistogramName,
+                                  action);
+    media_session::PerformMediaSessionAction(action, media_controller_remote_);
+  }
+}
+
 void LockScreenMediaControlsView::FlushForTesting() {
   media_controller_remote_.FlushForTesting();
 }

ash/login/ui/lock_screen_media_controls_view.h

@@ -13,11 +13,13 @@
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/media_session/public/mojom/media_controller.mojom.h"
+#include "services/media_session/public/mojom/media_session.mojom.h"
 #include "ui/compositor/layer_animation_observer.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/metadata/metadata_header_macros.h"
+#include "ui/views/view.h"
 
 namespace views {
+class Button;
 class Label;
 class ImageView;
 }  // namespace views
@@ -40,7 +42,6 @@ class ASH_EXPORT LockScreenMediaControlsView
       public media_session::mojom::MediaControllerObserver,
       public media_session::mojom::MediaControllerImageObserver,
       public base::PowerObserver,
-      public views::ButtonListener,
       public ui::ImplicitAnimationObserver {
  public:
   METADATA_HEADER(LockScreenMediaControlsView);
@@ -127,15 +128,14 @@ class ASH_EXPORT LockScreenMediaControlsView
   // ui::ImplicitAnimationObserver:
   void OnImplicitAnimationsCompleted() override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // ui::EventHandler:
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // base::PowerObserver:
   void OnSuspend() override;
 
+  void ButtonPressed(media_session::mojom::MediaSessionAction action);
+
   void FlushForTesting();
 
   void set_media_controller_for_testing(

ash/login/ui/login_auth_user_view.cc

@@ -540,8 +540,7 @@ class LoginAuthUserView::FingerprintView : public views::View {
 };
 
 // Consists of challenge-response icon view and a label.
-class LoginAuthUserView::ChallengeResponseView : public views::View,
-                                                 public views::ButtonListener {
+class LoginAuthUserView::ChallengeResponseView : public views::View {
  public:
   enum class State { kInitial, kAuthenticating, kFailure };
 
@@ -555,7 +554,9 @@ class LoginAuthUserView::ChallengeResponseView : public views::View,
     layout->set_cross_axis_alignment(
         views::BoxLayout::CrossAxisAlignment::kCenter);
     auto arrow_button_view = std::make_unique<ArrowButtonView>(
-        /*listener=*/this, kChallengeResponseArrowSizeDp);
+        base::BindRepeating(&ChallengeResponseView::ArrowButtonPressed,
+                            base::Unretained(this)),
+        kChallengeResponseArrowSizeDp);
     arrow_button_view->SetInstallFocusRingOnFocus(true);
     views::InstallCircleHighlightPathGenerator(arrow_button_view.get());
     arrow_button_ = AddChildView(std::move(arrow_button_view));
@@ -588,17 +589,6 @@ class LoginAuthUserView::ChallengeResponseView : public views::View,
 
   ~ChallengeResponseView() override = default;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
-    if (sender == arrow_button_) {
-      // Ignore further clicks while handling the previous one.
-      if (state_ != State::kAuthenticating)
-        on_start_tap_.Run();
-    } else {
-      NOTREACHED();
-    }
-  }
-
   void SetState(State state) {
     if (state_ == state)
       return;
@@ -656,6 +646,12 @@ class LoginAuthUserView::ChallengeResponseView : public views::View,
     }
   }
 
+  void ArrowButtonPressed() {
+    // Ignore further clicks while handling the previous one.
+    if (state_ != State::kAuthenticating)
+      on_start_tap_.Run();
+  }
+
   base::RepeatingClosure on_start_tap_;
   State state_ = State::kInitial;
   ArrowButtonView* arrow_button_ = nullptr;
@@ -1035,8 +1031,9 @@ LoginAuthUserView::LoginAuthUserView(const LoginUserInfo& user,
       gfx::Insets(kPinPasswordToggleButtonPaddingTop, 0, 0, 0)));
   pin_password_toggle_ =
       toggle_container->AddChildView(std::make_unique<SystemLabelButton>(
-          this, GetPinPasswordToggleText(),
-          SystemLabelButton::DisplayType::DEFAULT,
+          base::BindRepeating(&LoginAuthUserView::OnSwitchButtonClicked,
+                              base::Unretained(this)),
+          GetPinPasswordToggleText(), SystemLabelButton::DisplayType::DEFAULT,
           /*multiline*/ false));
   pin_password_toggle_->SetMaxSize(
       gfx::Size(/*ignored*/ 0, kPinPasswordToggleButtonHeight));
@@ -1067,7 +1064,9 @@ LoginAuthUserView::LoginAuthUserView(const LoginUserInfo& user,
         l10n_util::GetStringUTF16(IDS_ASH_LOCK_SCREEN_VERIFY_ACCOUNT_MESSAGE);
   }
   auto online_sign_in_message = std::make_unique<SystemLabelButton>(
-      this, button_message, SystemLabelButton::DisplayType::ALERT_WITH_ICON,
+      base::BindRepeating(&LoginAuthUserView::OnOnlineSignInMessageTap,
+                          base::Unretained(this)),
+      button_message, SystemLabelButton::DisplayType::ALERT_WITH_ICON,
       /*multiline*/ false);
   online_sign_in_message_ = online_sign_in_message.get();
 
@@ -1507,16 +1506,6 @@ void LoginAuthUserView::RequestFocus() {
     password_view_->RequestFocus();
 }
 
-void LoginAuthUserView::ButtonPressed(views::Button* sender,
-                                      const ui::Event& event) {
-  DCHECK(sender == online_sign_in_message_ || sender == pin_password_toggle_);
-  if (sender == online_sign_in_message_) {
-    OnOnlineSignInMessageTap();
-  } else if (sender == pin_password_toggle_) {
-    OnSwitchButtonClicked();
-  }
-}
-
 void LoginAuthUserView::OnAuthSubmit(const base::string16& password) {
   // Pressing enter when the password field is empty and tap-to-unlock is
   // enabled should attempt unlock.

ash/login/ui/login_auth_user_view.h

@@ -38,8 +38,7 @@ class LoginPinInputView;
 // This class will make call mojo authentication APIs directly. The embedder can
 // receive some events about the results of those mojo
 // authentication attempts (ie, success/failure).
-class ASH_EXPORT LoginAuthUserView : public NonAccessibleView,
-                                     public views::ButtonListener {
+class ASH_EXPORT LoginAuthUserView : public NonAccessibleView {
  public:
   // Flags which describe the set of currently visible auth methods.
   enum AuthMethods {
@@ -182,9 +181,6 @@ class ASH_EXPORT LoginAuthUserView : public NonAccessibleView,
   gfx::Size CalculatePreferredSize() const override;
   void RequestFocus() override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
  private:
   struct UiState;
   class FingerprintView;

ash/login/ui/login_auth_user_view_unittest.cc

@@ -26,6 +26,7 @@
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/test/button_test_api.h"
 #include "ui/views/widget/widget.h"
 
 using testing::_;
@@ -263,7 +264,7 @@ TEST_P(LoginAuthUserViewUnittest, OnlineSignInMessage) {
       ShowGaiaSignin(user_view->current_user().basic_user_info.account_id));
   const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                              ui::EventTimeForNow(), 0, 0);
-  view_->ButtonPressed(online_sign_in_message, event);
+  views::test::ButtonTestApi(online_sign_in_message).NotifyClick(event);
   base::RunLoop().RunUntilIdle();
 
   // The online sign-in message is invisible for all other auth methods.
@@ -448,7 +449,8 @@ TEST_P(LoginAuthUserViewUnittest, PinAutosubmitFieldModes) {
     // Clicking on the switch button changes to the password field
     const ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                                ui::EventTimeForNow(), 0, 0);
-    view_->ButtonPressed(auth_test.pin_password_toggle(), event);
+    views::test::ButtonTestApi(auth_test.pin_password_toggle())
+        .NotifyClick(event);
     base::RunLoop().RunUntilIdle();
     ExpectModeVisibility(LoginAuthUserView::InputFieldMode::PWD_WITH_TOGGLE);
     SetAuthMethods(LoginAuthUserView::AUTH_NONE);  // Clear state for next run.

ash/login/ui/login_expanded_public_account_view.cc

@@ -129,9 +129,8 @@ class LoginExpandedPublicAccountEventHandler : public ui::EventHandler {
 // Button with text on the left side and an icon on the right side.
 class SelectionButtonView : public LoginButton {
  public:
-  SelectionButtonView(const base::string16& text,
-                      views::ButtonListener* listener)
-      : LoginButton(listener) {
+  SelectionButtonView(PressedCallback callback, const base::string16& text)
+      : LoginButton(std::move(callback)) {
     SetPaintToLayer();
     layer()->SetFillsBoundsOpaquely(false);
     SetFocusBehavior(FocusBehavior::ALWAYS);
@@ -292,7 +291,7 @@ class MonitoringWarningView : public NonAccessibleView {
 };
 
 // Implements the right part of the expanded public session view.
-class RightPaneView : public NonAccessibleView, public views::ButtonListener {
+class RightPaneView : public NonAccessibleView {
  public:
   explicit RightPaneView(const base::RepeatingClosure& on_learn_more_tapped) {
     SetPreferredSize(
@@ -336,9 +335,10 @@ class RightPaneView : public NonAccessibleView, public views::ButtonListener {
 
     // Create button to show/hide advanced view.
     advanced_view_button_ = new SelectionButtonView(
+        base::BindRepeating(&RightPaneView::AdvancedViewButtonPressed,
+                            base::Unretained(this)),
         l10n_util::GetStringUTF16(
-            IDS_ASH_LOGIN_PUBLIC_SESSION_LANGUAGE_AND_INPUT),
-        this);
+            IDS_ASH_LOGIN_PUBLIC_SESSION_LANGUAGE_AND_INPUT));
     advanced_view_button_->SetTextColor(kPublicSessionBlueColor);
     advanced_view_button_->SetIcon(kLoginScreenButtonDropdownIcon,
                                    kPublicSessionBlueColor);
@@ -354,8 +354,9 @@ class RightPaneView : public NonAccessibleView, public views::ButtonListener {
 
     // Creates button to open the menu.
     auto create_menu_button =
-        [&](const base::string16& text) -> SelectionButtonView* {
-      auto* button = new SelectionButtonView(text, this);
+        [&](views::Button::PressedCallback callback,
+            const base::string16& text) -> SelectionButtonView* {
+      auto* button = new SelectionButtonView(std::move(callback), text);
       button->SetPreferredSize(
           gfx::Size(kSelectionBoxWidthDp, kSelectionBoxHeightDp));
       button->SetMargins(kLeftMarginForSelectionButton,
@@ -375,12 +376,18 @@ class RightPaneView : public NonAccessibleView, public views::ButtonListener {
     views::Label* language_title = CreateLabel(
         l10n_util::GetStringUTF16(IDS_ASH_LOGIN_LANGUAGE_SELECTION_SELECT),
         kSelectionMenuTitleColor);
-    language_selection_ = create_menu_button(base::string16());
+    language_selection_ = create_menu_button(
+        base::BindRepeating(&RightPaneView::LanguageSelectionButtonPressed,
+                            base::Unretained(this)),
+        base::string16());
 
     views::Label* keyboard_title = CreateLabel(
         l10n_util::GetStringUTF16(IDS_ASH_LOGIN_KEYBOARD_SELECTION_SELECT),
         kSelectionMenuTitleColor);
-    keyboard_selection_ = create_menu_button(base::string16());
+    keyboard_selection_ = create_menu_button(
+        base::BindRepeating(&RightPaneView::KeyboardSelectionButtonPressed,
+                            base::Unretained(this)),
+        base::string16());
 
     advanced_view_->AddChildView(language_title);
     advanced_view_->AddChildView(
@@ -393,7 +400,10 @@ class RightPaneView : public NonAccessibleView, public views::ButtonListener {
         create_padding(kSpacingBetweenSelectionTitleAndButtonDp));
     advanced_view_->AddChildView(keyboard_selection_);
 
-    submit_button_ = new ArrowButtonView(this, kArrowButtonSizeDp);
+    submit_button_ = new ArrowButtonView(
+        base::BindRepeating(&RightPaneView::SubmitButtonPressed,
+                            base::Unretained(this)),
+        kArrowButtonSizeDp);
     submit_button_->SetBackgroundColor(kArrowButtonColor);
     AddChildView(submit_button_);
   }
@@ -435,49 +445,6 @@ class RightPaneView : public NonAccessibleView, public views::ButtonListener {
                    bounds.bottom() - kArrowButtonSizeDp));
   }
 
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
-    if (sender == advanced_view_button_) {
-      show_advanced_view_ = !show_advanced_view_;
-      show_advanced_changed_by_user_ = true;
-      Layout();
-    } else if (sender == submit_button_) {
-      // TODO(crbug.com/984021) change to LaunchSamlPublicSession which would
-      // take selected_language_item_.value, selected_keyboard_item_.value too.
-      if (current_user_.public_account_info->using_saml) {
-        Shell::Get()->login_screen_controller()->ShowGaiaSignin(
-            current_user_.basic_user_info.account_id);
-      } else {
-        Shell::Get()->login_screen_controller()->LaunchPublicSession(
-            current_user_.basic_user_info.account_id,
-            selected_language_item_.value, selected_keyboard_item_.value);
-      }
-    } else if (sender == language_selection_) {
-      DCHECK(language_menu_view_);
-      if (language_menu_view_->GetVisible()) {
-        language_menu_view_->Hide();
-      } else {
-        bool opener_had_focus = language_selection_->HasFocus();
-
-        language_menu_view_->Show();
-
-        if (opener_had_focus)
-          language_menu_view_->RequestFocus();
-      }
-    } else if (sender == keyboard_selection_) {
-      DCHECK(keyboard_menu_view_);
-      if (keyboard_menu_view_->GetVisible()) {
-        keyboard_menu_view_->Hide();
-      } else {
-        bool opener_had_focus = keyboard_selection_->HasFocus();
-
-        keyboard_menu_view_->Show();
-
-        if (opener_had_focus)
-          keyboard_menu_view_->RequestFocus();
-      }
-    }
-  }
-
   void UpdateForUser(const LoginUserInfo& user) {
     DCHECK_EQ(user.basic_user_info.type,
               user_manager::USER_TYPE_PUBLIC_ACCOUNT);
@@ -611,6 +578,53 @@ class RightPaneView : public NonAccessibleView, public views::ButtonListener {
  private:
   friend class LoginExpandedPublicAccountView::TestApi;
 
+  void AdvancedViewButtonPressed() {
+    show_advanced_view_ = !show_advanced_view_;
+    show_advanced_changed_by_user_ = true;
+    Layout();
+  }
+
+  void SubmitButtonPressed() {
+    // TODO(crbug.com/984021) change to LaunchSamlPublicSession which would
+    // take selected_language_item_.value, selected_keyboard_item_.value too.
+    if (current_user_.public_account_info->using_saml) {
+      Shell::Get()->login_screen_controller()->ShowGaiaSignin(
+          current_user_.basic_user_info.account_id);
+    } else {
+      Shell::Get()->login_screen_controller()->LaunchPublicSession(
+          current_user_.basic_user_info.account_id,
+          selected_language_item_.value, selected_keyboard_item_.value);
+    }
+  }
+
+  void LanguageSelectionButtonPressed() {
+    DCHECK(language_menu_view_);
+    if (language_menu_view_->GetVisible()) {
+      language_menu_view_->Hide();
+    } else {
+      bool opener_had_focus = language_selection_->HasFocus();
+
+      language_menu_view_->Show();
+
+      if (opener_had_focus)
+        language_menu_view_->RequestFocus();
+    }
+  }
+
+  void KeyboardSelectionButtonPressed() {
+    DCHECK(keyboard_menu_view_);
+    if (keyboard_menu_view_->GetVisible()) {
+      keyboard_menu_view_->Hide();
+    } else {
+      bool opener_had_focus = keyboard_selection_->HasFocus();
+
+      keyboard_menu_view_->Show();
+
+      if (opener_had_focus)
+        keyboard_menu_view_->RequestFocus();
+    }
+  }
+
   bool show_advanced_view_ = false;
   LoginUserInfo current_user_;
 
@@ -760,20 +774,6 @@ std::vector<LocaleItem> LoginExpandedPublicAccountView::TestApi::GetLocales() {
   return locales;
 }
 
-void LoginExpandedPublicAccountView::TestApi::OnAdvancedButtonTap() {
-  view_->right_pane_->ButtonPressed(
-      views::Button::AsButton(advanced_view_button()),
-      ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::PointF(), gfx::PointF(),
-                     base::TimeTicks(), 0, 0));
-}
-
-void LoginExpandedPublicAccountView::TestApi::OnSubmitButtonTap() {
-  view_->right_pane_->ButtonPressed(
-      views::Button::AsButton(submit_button()),
-      ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::PointF(), gfx::PointF(),
-                     base::TimeTicks(), 0, 0));
-}
-
 LoginExpandedPublicAccountView::LoginExpandedPublicAccountView(
     const OnPublicSessionViewDismissed& on_dismissed)
     : NonAccessibleView(kLoginExpandedPublicAccountViewClassName),

ash/login/ui/login_expanded_public_account_view.h

@@ -56,9 +56,6 @@ class ASH_EXPORT LoginExpandedPublicAccountView : public NonAccessibleView {
     bool SelectKeyboard(const std::string& ime_id);
     std::vector<LocaleItem> GetLocales();
 
-    void OnAdvancedButtonTap();
-    void OnSubmitButtonTap();
-
    private:
     LoginExpandedPublicAccountView* const view_;
   };

ash/login/ui/login_menu_view.cc

@@ -31,11 +31,14 @@ namespace {
 
 constexpr SkColor kMenuBackgroundColor = SkColorSetRGB(0x3C, 0x40, 0x43);
 
-class MenuItemView : public views::Button, public views::ButtonListener {
+class MenuItemView : public views::Button {
  public:
   MenuItemView(const LoginMenuView::Item& item,
                const LoginMenuView::OnHighlight& on_highlight)
-      : views::Button(this), item_(item), on_highlight_(on_highlight) {
+      : views::Button(base::BindRepeating(&MenuItemView::ButtonPressed,
+                                          base::Unretained(this))),
+        item_(item),
+        on_highlight_(on_highlight) {
     SetFocusBehavior(FocusBehavior::ALWAYS);
     SetLayoutManager(std::make_unique<views::BoxLayout>(
         views::BoxLayout::Orientation::kHorizontal));
@@ -71,15 +74,6 @@ class MenuItemView : public views::Button, public views::ButtonListener {
     return GetPreferredSize().height();
   }
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
-    DCHECK(sender == this);
-    if (item_.is_group)
-      return;
-
-    on_highlight_.Run(true /*by_selection*/);
-  }
-
   void OnHover(bool has_hover) {
     if (has_hover && !item_.is_group)
       RequestFocus();
@@ -93,6 +87,11 @@ class MenuItemView : public views::Button, public views::ButtonListener {
   const LoginMenuView::Item& item() const { return item_; }
 
  private:
+  void ButtonPressed() {
+    if (!item_.is_group)
+      on_highlight_.Run(true /*by_selection*/);
+  }
+
   const LoginMenuView::Item item_;
   const LoginMenuView::OnHighlight on_highlight_;
   std::unique_ptr<HoverNotifier> hover_notifier_;

ash/login/ui/login_public_account_user_view.cc

@@ -51,12 +51,6 @@ views::View* LoginPublicAccountUserView::TestApi::arrow_button() const {
   return view_->arrow_button_;
 }
 
-void LoginPublicAccountUserView::TestApi::OnArrowTap() const {
-  view_->ButtonPressed(views::Button::AsButton(arrow_button()),
-                       ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::PointF(),
-                                      gfx::PointF(), base::TimeTicks(), 0, 0));
-}
-
 LoginPublicAccountUserView::Callbacks::Callbacks() = default;
 
 LoginPublicAccountUserView::Callbacks::Callbacks(const Callbacks& other) =
@@ -79,8 +73,10 @@ LoginPublicAccountUserView::LoginPublicAccountUserView(
       base::BindRepeating(&LoginPublicAccountUserView::OnUserViewTap,
                           base::Unretained(this)),
       base::RepeatingClosure(), base::RepeatingClosure());
-  auto arrow_button =
-      std::make_unique<ArrowButtonView>(this, kArrowButtonSizeDp);
+  auto arrow_button = std::make_unique<ArrowButtonView>(
+      base::BindRepeating(&LoginPublicAccountUserView::ArrowButtonPressed,
+                          base::Unretained(this)),
+      kArrowButtonSizeDp);
   arrow_button->SetBackgroundColor(kArrowButtonBackground);
   arrow_button->SetFocusPainter(nullptr);
 
@@ -150,18 +146,14 @@ gfx::Size LoginPublicAccountUserView::CalculatePreferredSize() const {
   return size;
 }
 
-void LoginPublicAccountUserView::ButtonPressed(views::Button* sender,
-                                               const ui::Event& event) {
-  if (sender == arrow_button_) {
-    DCHECK(arrow_button_);
-    // If the pod isn't active, activate it first.
-    if (!auth_enabled_) {
-      OnUserViewTap();
-    }
-
-    DCHECK(auth_enabled_);
-    on_public_account_tap_.Run();
-  }
+void LoginPublicAccountUserView::ArrowButtonPressed() {
+  DCHECK(arrow_button_);
+  // If the pod isn't active, activate it first.
+  if (!auth_enabled_)
+    OnUserViewTap();
+
+  DCHECK(auth_enabled_);
+  on_public_account_tap_.Run();
 }
 
 void LoginPublicAccountUserView::OnUserViewTap() {

ash/login/ui/login_public_account_user_view.h

@@ -8,7 +8,6 @@
 #include "ash/ash_export.h"
 #include "ash/login/ui/login_user_view.h"
 #include "ash/login/ui/non_accessible_view.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 namespace ash {
@@ -18,8 +17,7 @@ class HoverNotifier;
 
 // This is the big user view for the public account user. It wraps a UserView
 // and a arrow button below.
-class ASH_EXPORT LoginPublicAccountUserView : public NonAccessibleView,
-                                              public views::ButtonListener {
+class ASH_EXPORT LoginPublicAccountUserView : public NonAccessibleView {
  public:
   // TestApi is used for tests to get internal implementation details.
   class ASH_EXPORT TestApi {
@@ -29,8 +27,6 @@ class ASH_EXPORT LoginPublicAccountUserView : public NonAccessibleView,
 
     views::View* arrow_button() const;
 
-    void OnArrowTap() const;
-
    private:
     LoginPublicAccountUserView* const view_;
   };
@@ -59,13 +55,12 @@ class ASH_EXPORT LoginPublicAccountUserView : public NonAccessibleView,
   // views::View:
   gfx::Size CalculatePreferredSize() const override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   bool auth_enabled() const { return auth_enabled_; }
   LoginUserView* user_view() { return user_view_; }
 
  private:
+  void ArrowButtonPressed();
+
   // Called when the user view has been tapped and it will run |on_tap_|.
   void OnUserViewTap();
 

ash/login/ui/login_user_menu_view.cc

@@ -71,8 +71,8 @@ class TrappedFocusSearch : public views::FocusSearch {
 // A button that holds a child view.
 class RemoveUserButton : public SystemLabelButton {
  public:
-  RemoveUserButton(views::ButtonListener* listener, LoginUserMenuView* bubble)
-      : SystemLabelButton(listener,
+  RemoveUserButton(PressedCallback callback, LoginUserMenuView* bubble)
+      : SystemLabelButton(std::move(callback),
                           l10n_util::GetStringUTF16(
                               IDS_ASH_LOGIN_POD_REMOVE_ACCOUNT_ACCESSIBLE_NAME),
                           SystemLabelButton::DisplayType::DEFAULT,
@@ -213,7 +213,10 @@ LoginUserMenuView::LoginUserMenuView(
     remove_user_confirm_data_->AddChildView(
         login_views_utils::CreateBubbleLabel(part2, gfx::kGoogleGrey200, this));
 
-    remove_user_button_ = new RemoveUserButton(this, this);
+    remove_user_button_ = new RemoveUserButton(
+        base::BindRepeating(&LoginUserMenuView::RemoveUserButtonPressed,
+                            base::Unretained(this)),
+        this);
     remove_user_button_->SetID(kUserMenuRemoveUserButtonIdForTest);
     AddChildView(remove_user_button_);
 
@@ -245,37 +248,6 @@ LoginButton* LoginUserMenuView::GetBubbleOpener() const {
   return bubble_opener_;
 }
 
-void LoginUserMenuView::ButtonPressed(views::Button* sender,
-                                      const ui::Event& event) {
-  // Show confirmation warning. The user has to click the button again before
-  // we actually allow the exit.
-  if (!remove_user_confirm_data_->GetVisible()) {
-    remove_user_confirm_data_->SetVisible(true);
-    if (managed_user_data_)
-      managed_user_data_->SetVisible(false);
-    remove_user_button_->SetDisplayType(
-        SystemLabelButton::DisplayType::ALERT_NO_ICON);
-
-    Layout();
-
-    // Change the node's description to force assistive technologies, like
-    // ChromeVox, to report the updated description.
-    remove_user_button_->GetViewAccessibility().OverrideDescription(
-        warning_message_);
-    if (on_remove_user_warning_shown_)
-      std::move(on_remove_user_warning_shown_).Run();
-    return;
-  }
-
-  // Immediately hide the bubble with no animation before running the remove
-  // user callback. If an animation is triggered while the the views hierarchy
-  // for this bubble is being torn down, we can get a crash.
-  SetVisible(false);
-
-  if (on_remove_user_requested_)
-    std::move(on_remove_user_requested_).Run();
-}
-
 void LoginUserMenuView::RequestFocus() {
   // This view has no actual interesting contents to focus, so immediately
   // forward to the button.
@@ -316,4 +288,34 @@ views::View* LoginUserMenuView::GetFocusTraversableParentView() {
   return nullptr;
 }
 
+void LoginUserMenuView::RemoveUserButtonPressed() {
+  // Show confirmation warning. The user has to click the button again before
+  // we actually allow the exit.
+  if (!remove_user_confirm_data_->GetVisible()) {
+    remove_user_confirm_data_->SetVisible(true);
+    if (managed_user_data_)
+      managed_user_data_->SetVisible(false);
+    remove_user_button_->SetDisplayType(
+        SystemLabelButton::DisplayType::ALERT_NO_ICON);
+
+    Layout();
+
+    // Change the node's description to force assistive technologies, like
+    // ChromeVox, to report the updated description.
+    remove_user_button_->GetViewAccessibility().OverrideDescription(
+        warning_message_);
+    if (on_remove_user_warning_shown_)
+      std::move(on_remove_user_warning_shown_).Run();
+    return;
+  }
+
+  // Immediately hide the bubble with no animation before running the remove
+  // user callback. If an animation is triggered while the the views hierarchy
+  // for this bubble is being torn down, we can get a crash.
+  SetVisible(false);
+
+  if (on_remove_user_requested_)
+    std::move(on_remove_user_requested_).Run();
+}
+
 }  // namespace ash

ash/login/ui/login_user_menu_view.h

@@ -20,7 +20,6 @@ struct LoginUserInfo;
 class RemoveUserButton;
 
 class ASH_EXPORT LoginUserMenuView : public LoginBaseBubbleView,
-                                     public views::ButtonListener,
                                      public views::FocusTraversable {
  public:
   class TestApi {
@@ -52,9 +51,6 @@ class ASH_EXPORT LoginUserMenuView : public LoginBaseBubbleView,
   // LoginBaseBubbleView:
   LoginButton* GetBubbleOpener() const override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // views::View:
   void RequestFocus() override;
   bool HasFocus() const override;
@@ -68,6 +64,8 @@ class ASH_EXPORT LoginUserMenuView : public LoginBaseBubbleView,
   views::View* GetFocusTraversableParentView() override;
 
  private:
+  void RemoveUserButtonPressed();
+
   LoginButton* bubble_opener_ = nullptr;
   base::RepeatingClosure on_remove_user_warning_shown_;
   base::RepeatingClosure on_remove_user_requested_;

ash/login/ui/login_user_view.cc

@@ -308,8 +308,8 @@ class LoginUserView::UserLabel : public NonAccessibleView {
 // have any children (ie, the dropdown button).
 class LoginUserView::TapButton : public views::Button {
  public:
-  explicit TapButton(LoginUserView* parent)
-      : views::Button(parent), parent_(parent) {}
+  TapButton(PressedCallback callback, LoginUserView* parent)
+      : views::Button(std::move(callback)), parent_(parent) {}
   ~TapButton() override = default;
 
   // views::Button:
@@ -413,7 +413,8 @@ LoginUserView::LoginUserView(
       2 * (kDistanceBetweenUsernameAndDropdownDp + kDropdownIconSizeDp);
   user_label_ = new UserLabel(style, label_width);
   if (show_dropdown) {
-    dropdown_ = new LoginButton(this);
+    dropdown_ = new LoginButton(base::BindRepeating(
+        &LoginUserView::DropdownButtonPressed, base::Unretained(this)));
     dropdown_->SetHasInkDropActionOnClick(false);
     dropdown_->SetPreferredSize(
         gfx::Size(kDropdownIconSizeDp, kDropdownIconSizeDp));
@@ -422,7 +423,7 @@ LoginUserView::LoginUserView(
         gfx::CreateVectorIcon(kLockScreenDropdownIcon, gfx::kGoogleGrey200));
     dropdown_->SetFocusBehavior(FocusBehavior::ALWAYS);
   }
-  tap_button_ = new TapButton(this);
+  tap_button_ = new TapButton(on_tap_, this);
   SetTapEnabled(true);
 
   switch (style) {
@@ -554,44 +555,35 @@ void LoginUserView::RequestFocus() {
   tap_button_->RequestFocus();
 }
 
-void LoginUserView::ButtonPressed(views::Button* sender,
-                                  const ui::Event& event) {
-  // Handle click on the dropdown arrow.
-  if (sender == dropdown_) {
-    DCHECK(dropdown_);
-    DCHECK(menu_);
-
-    // If menu is showing, just close it
-    if (menu_->GetVisible()) {
-      menu_->Hide();
-      return;
-    }
-
-    bool opener_focused =
-        menu_->GetBubbleOpener() && menu_->GetBubbleOpener()->HasFocus();
-
-    if (!menu_->parent())
-      login_views_utils::GetBubbleContainer(this)->AddChildView(menu_);
-
-    // Reset state in case the remove-user button was clicked once previously.
-    menu_->ResetState();
-    menu_->Show();
+void LoginUserView::OnHover(bool has_hover) {
+  UpdateOpacity();
+}
 
-    // If the menu was opened by pressing Enter on the focused dropdown, focus
-    // should automatically go to the remove-user button (for keyboard
-    // accessibility).
-    if (opener_focused)
-      menu_->RequestFocus();
+void LoginUserView::DropdownButtonPressed() {
+  DCHECK(dropdown_);
+  DCHECK(menu_);
 
+  // If menu is showing, just close it
+  if (menu_->GetVisible()) {
+    menu_->Hide();
     return;
   }
 
-  // Run generic on_tap handler for any other click.
-  on_tap_.Run();
-}
+  bool opener_focused =
+      menu_->GetBubbleOpener() && menu_->GetBubbleOpener()->HasFocus();
 
-void LoginUserView::OnHover(bool has_hover) {
-  UpdateOpacity();
+  if (!menu_->parent())
+    login_views_utils::GetBubbleContainer(this)->AddChildView(menu_);
+
+  // Reset state in case the remove-user button was clicked once previously.
+  menu_->ResetState();
+  menu_->Show();
+
+  // If the menu was opened by pressing Enter on the focused dropdown, focus
+  // should automatically go to the remove-user button (for keyboard
+  // accessibility).
+  if (opener_focused)
+    menu_->RequestFocus();
 }
 
 void LoginUserView::UpdateCurrentUserState() {

ash/login/ui/login_user_view.h

@@ -11,7 +11,6 @@
 #include "ash/login/ui/login_user_menu_view.h"
 #include "ash/public/cpp/login_types.h"
 #include "base/macros.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 namespace ash {
@@ -21,8 +20,7 @@ class LoginButton;
 
 // Display the user's profile icon, name, and a menu icon in various layout
 // styles.
-class ASH_EXPORT LoginUserView : public views::View,
-                                 public views::ButtonListener {
+class ASH_EXPORT LoginUserView : public views::View {
  public:
   // TestApi is used for tests to get internal implementation details.
   class ASH_EXPORT TestApi {
@@ -81,9 +79,6 @@ class ASH_EXPORT LoginUserView : public views::View,
   void Layout() override;
   void RequestFocus() override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
  private:
   class UserImage;
   class UserLabel;
@@ -92,6 +87,8 @@ class ASH_EXPORT LoginUserView : public views::View,
   // Called when hover state changes.
   void OnHover(bool has_hover);
 
+  void DropdownButtonPressed();
+
   // Updates UI element values so they reflect the data in |current_user_|.
   void UpdateCurrentUserState();
   // Updates view opacity based on input state and |force_opaque_|.

ash/login/ui/note_action_launch_button.cc

@@ -178,11 +178,11 @@ class BubbleTargeterDelegate : public views::MaskedTargeterDelegate {
 // The action button foreground - an image button with actionable area matching
 // the (small) bubble shape centered in the top right corner of the action
 // button bounds.
-class NoteActionLaunchButton::ActionButton : public views::ImageButton,
-                                             public views::ButtonListener {
+class NoteActionLaunchButton::ActionButton : public views::ImageButton {
  public:
   explicit ActionButton(NoteActionLaunchButton::BackgroundView* background)
-      : views::ImageButton(this),
+      : views::ImageButton(base::BindRepeating(&ActionButton::ButtonPressed,
+                                               base::Unretained(this))),
         background_(background),
         event_targeter_delegate_(kLargeBubbleRadiusDp, kSmallBubbleRadiusDp) {
     SetAccessibleName(
@@ -269,19 +269,6 @@ class NoteActionLaunchButton::ActionButton : public views::ImageButton,
       views::ImageButton::OnGestureEvent(event);
   }
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override {
-    UserMetricsRecorder::RecordUserClickOnTray(
-        LoginMetricsRecorder::TrayClickTarget::kTrayActionNoteButton);
-    if (event.IsKeyEvent()) {
-      Shell::Get()->tray_action()->RequestNewLockScreenNote(
-          mojom::LockScreenNoteOrigin::kLockScreenButtonKeyboard);
-    } else {
-      Shell::Get()->tray_action()->RequestNewLockScreenNote(
-          mojom::LockScreenNoteOrigin::kLockScreenButtonTap);
-    }
-  }
-
  private:
   // Updates the background view size and opacity depending on the current note
   // action button state.
@@ -294,6 +281,18 @@ class NoteActionLaunchButton::ActionButton : public views::ImageButton,
         show_large_bubble ? kLargeBubbleOpacity : kSmallBubbleOpacity);
   }
 
+  void ButtonPressed(const ui::Event& event) {
+    UserMetricsRecorder::RecordUserClickOnTray(
+        LoginMetricsRecorder::TrayClickTarget::kTrayActionNoteButton);
+    if (event.IsKeyEvent()) {
+      Shell::Get()->tray_action()->RequestNewLockScreenNote(
+          mojom::LockScreenNoteOrigin::kLockScreenButtonKeyboard);
+    } else {
+      Shell::Get()->tray_action()->RequestNewLockScreenNote(
+          mojom::LockScreenNoteOrigin::kLockScreenButtonTap);
+    }
+  }
+
   // Called when a fling is detected - if the gesture direction was bottom-left,
   // it requests a new lock screen note.
   void MaybeActivateActionOnFling(ui::GestureEvent* event) {

ash/login/ui/pin_request_view.cc

@@ -95,9 +95,8 @@ PinRequest::~PinRequest() = default;
 // Label button that displays focus ring.
 class PinRequestView::FocusableLabelButton : public views::LabelButton {
  public:
-  FocusableLabelButton(views::ButtonListener* listener,
-                       const base::string16& text)
-      : views::LabelButton(listener, text) {
+  FocusableLabelButton(PressedCallback callback, const base::string16& text)
+      : views::LabelButton(std::move(callback), text) {
     SetInstallFocusRingOnFocus(true);
     focus_ring()->SetColor(ShelfConfig::Get()->shelf_focus_border_color());
     SetFocusBehavior(FocusBehavior::ALWAYS);
@@ -251,7 +250,8 @@ PinRequestView::PinRequestView(PinRequest request, Delegate* delegate)
   back_button_view->SetLayoutManager(std::move(back_button_layout));
   header->AddChildView(back_button_view);
 
-  back_button_ = new LoginButton(this);
+  back_button_ = new LoginButton(
+      base::BindRepeating(&PinRequestView::OnBack, base::Unretained(this)));
   back_button_->SetPreferredSize(
       gfx::Size(kBackButtonSizeDp, kBackButtonSizeDp));
   back_button_->SetBackground(
@@ -364,7 +364,12 @@ PinRequestView::PinRequestView(PinRequest request, Delegate* delegate)
   AddChildView(footer);
 
   help_button_ = new FocusableLabelButton(
-      this, l10n_util::GetStringUTF16(IDS_ASH_LOGIN_PIN_REQUEST_HELP));
+      base::BindRepeating(
+          [](PinRequestView* view) {
+            view->delegate_->OnHelp(view->GetWidget()->GetNativeWindow());
+          },
+          this),
+      l10n_util::GetStringUTF16(IDS_ASH_LOGIN_PIN_REQUEST_HELP));
   help_button_->SetPaintToLayer();
   help_button_->layer()->SetFillsBoundsOpaquely(false);
   help_button_->SetTextSubpixelRenderingEnabled(false);
@@ -376,7 +381,9 @@ PinRequestView::PinRequestView(PinRequest request, Delegate* delegate)
   footer->AddChildView(horizontal_spacer);
   bottom_layout->SetFlexForView(horizontal_spacer, 1);
 
-  submit_button_ = new ArrowButtonView(this, kArrowButtonSizeDp);
+  submit_button_ = new ArrowButtonView(
+      base::BindRepeating(&PinRequestView::SubmitCode, base::Unretained(this)),
+      kArrowButtonSizeDp);
   submit_button_->SetBackgroundColor(kArrowButtonColor);
   submit_button_->SetPreferredSize(
       gfx::Size(kArrowButtonSizeDp, kArrowButtonSizeDp));
@@ -422,17 +429,6 @@ base::string16 PinRequestView::GetAccessibleWindowTitle() const {
   return default_accessible_title_;
 }
 
-void PinRequestView::ButtonPressed(views::Button* sender,
-                                   const ui::Event& event) {
-  if (sender == back_button_) {
-    OnBack();
-  } else if (sender == help_button_) {
-    delegate_->OnHelp(GetWidget()->GetNativeWindow());
-  } else if (sender == submit_button_) {
-    SubmitCode();
-  }
-}
-
 void PinRequestView::OnTabletModeStarted() {
   if (!pin_keyboard_always_enabled_) {
     VLOG(1) << "Showing PIN keyboard in PinRequestView";

ash/login/ui/pin_request_view.h

@@ -12,7 +12,6 @@
 #include "ash/public/cpp/login_types.h"
 #include "ash/public/cpp/tablet_mode_observer.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
@@ -71,7 +70,6 @@ struct ASH_EXPORT PinRequest {
 
 // The view that allows for input of pins to authorize certain actions.
 class ASH_EXPORT PinRequestView : public views::DialogDelegateView,
-                                  public views::ButtonListener,
                                   public TabletModeObserver {
  public:
   enum class SubmissionResult {
@@ -133,9 +131,6 @@ class ASH_EXPORT PinRequestView : public views::DialogDelegateView,
   views::View* GetInitiallyFocusedView() override;
   base::string16 GetAccessibleWindowTitle() const override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // TabletModeObserver:
   void OnTabletModeStarted() override;
   void OnTabletModeEnded() override;

ash/login/ui/pin_request_view_unittest.cc

@@ -42,6 +42,7 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/test/button_test_api.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ -117,7 +118,7 @@ class PinRequestViewTest : public LoginTestBase,
     PinRequestView::TestApi test_api(view);
     ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                          ui::EventTimeForNow(), 0, 0);
-    view->ButtonPressed(test_api.back_button(), event);
+    views::test::ButtonTestApi(test_api.back_button()).NotifyClick(event);
   }
 
   void SimulateFailedValidation() {

ash/login/ui/system_label_button.cc

@@ -52,11 +52,11 @@ SkPath GetSystemButtonHighlightPath(const views::View* view) {
 
 }  // namespace
 
-SystemLabelButton::SystemLabelButton(views::ButtonListener* listener,
+SystemLabelButton::SystemLabelButton(PressedCallback callback,
                                      const base::string16& text,
                                      DisplayType display_type,
                                      bool multiline)
-    : LabelButton(listener, text), display_type_(display_type) {
+    : LabelButton(std::move(callback), text), display_type_(display_type) {
   SetImageLabelSpacing(kSystemButtonImageLabelSpacing);
   if (multiline) {
     label()->SetMultiLine(true);

ash/login/ui/system_label_button.h

@@ -15,7 +15,7 @@ class ASH_EXPORT SystemLabelButton : public views::LabelButton {
  public:
   enum class DisplayType { DEFAULT, ALERT_NO_ICON, ALERT_WITH_ICON };
 
-  SystemLabelButton(views::ButtonListener* listener,
+  SystemLabelButton(PressedCallback callback,
                     const base::string16& text,
                     DisplayType display_type,
                     bool multiline = false);

ash/session/fullscreen_alert_bubble.cc

@@ -86,13 +86,15 @@ class FullscreenAlertBubbleView : public views::View {
 
     auto* dismiss =
         button_container->AddChildView(std::make_unique<SystemLabelButton>(
-            nullptr, l10n_util::GetStringUTF16(IDS_DISMISS_BUTTON),
+            views::Button::PressedCallback(),
+            l10n_util::GetStringUTF16(IDS_DISMISS_BUTTON),
             SystemLabelButton::DisplayType::DEFAULT));
     dismiss->SetCallback(on_dismiss);
 
     auto* exit_fullscreen =
         button_container->AddChildView(std::make_unique<SystemLabelButton>(
-            nullptr, l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_BUTTON),
+            views::Button::PressedCallback(),
+            l10n_util::GetStringUTF16(IDS_EXIT_FULLSCREEN_BUTTON),
             SystemLabelButton::DisplayType::ALERT_NO_ICON));
     exit_fullscreen->SetCallback(on_exit_fullscreen);
   }