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

Bug: 772945
Change-Id: I392d3bde5479806c1f9e03151dd25a8f394c7dcc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2441129
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812670}

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

@@ -25,14 +25,18 @@ ExtensionsMenuButton::ExtensionsMenuButton(
     ExtensionsMenuItemView* parent,
     ToolbarActionViewController* controller,
     bool allow_pinning)
-    : views::LabelButton(this),
+    : views::LabelButton(
+          base::BindRepeating(&ExtensionsMenuButton::ButtonPressed,
+                              base::Unretained(this))),
       browser_(browser),
       parent_(parent),
       controller_(controller),
       allow_pinning_(allow_pinning) {
   ConfigureBubbleMenuItem(this, 0);
   SetButtonController(std::make_unique<HoverButtonController>(
-      this, PressedCallback(this, this),
+      this,
+      base::BindRepeating(&ExtensionsMenuButton::ButtonPressed,
+                          base::Unretained(this)),
       std::make_unique<views::Button::DefaultButtonControllerDelegate>(this)));
   controller_->SetDelegate(this);
   UpdateState();
@@ -52,14 +56,6 @@ bool ExtensionsMenuButton::CanShowIconInToolbar() const {
   return allow_pinning_;
 }
 
-void ExtensionsMenuButton::ButtonPressed(Button* sender,
-                                         const ui::Event& event) {
-  base::RecordAction(
-      base::UserMetricsAction("Extensions.Toolbar.ExtensionActivatedFromMenu"));
-  controller_->ExecuteAction(
-      true, ToolbarActionViewController::InvocationSource::kMenuEntry);
-}
-
 // ToolbarActionViewDelegateViews:
 views::View* ExtensionsMenuButton::GetAsView() {
   return this;
@@ -102,3 +98,10 @@ void ExtensionsMenuButton::UpdateState() {
 bool ExtensionsMenuButton::IsMenuRunning() const {
   return parent_->IsContextMenuRunning();
 }
+
+void ExtensionsMenuButton::ButtonPressed() {
+  base::RecordAction(
+      base::UserMetricsAction("Extensions.Toolbar.ExtensionActivatedFromMenu"));
+  controller_->ExecuteAction(
+      true, ToolbarActionViewController::InvocationSource::kMenuEntry);
+}

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

@@ -24,7 +24,6 @@ class Button;
 // the extensions menu. This includes the extension icon and name and triggers
 // the extension action.
 class ExtensionsMenuButton : public views::LabelButton,
-                             public views::ButtonListener,
                              public ToolbarActionViewDelegateViews {
  public:
   ExtensionsMenuButton(Browser* browser,
@@ -47,7 +46,6 @@ class ExtensionsMenuButton : public views::LabelButton,
  private:
   // views::ButtonListener:
   const char* GetClassName() const override;
-  void ButtonPressed(Button* sender, const ui::Event& event) override;
 
   // ToolbarActionViewDelegateViews:
   views::View* GetAsView() override;
@@ -57,6 +55,8 @@ class ExtensionsMenuButton : public views::LabelButton,
   void UpdateState() override;
   bool IsMenuRunning() const override;
 
+  void ButtonPressed();
+
   Browser* const browser_;
 
   // The container containing this view.

chrome/browser/ui/views/extensions/extensions_menu_item_view.cc

@@ -71,7 +71,10 @@ ExtensionsMenuItemView::ExtensionsMenuItemView(
                                views::MaximumFlexSizeRule::kUnbounded));
 
   if (primary_action_button_->CanShowIconInToolbar()) {
-    auto pin_button = CreateBubbleMenuItem(EXTENSION_PINNING, this);
+    auto pin_button = CreateBubbleMenuItem(
+        EXTENSION_PINNING,
+        base::BindRepeating(&ExtensionsMenuItemView::PinButtonPressed,
+                            base::Unretained(this)));
     pin_button->SetBorder(views::CreateEmptyBorder(kSecondaryButtonInsets));
     // Extension pinning is not available in Incognito as it leaves a trace of
     // user activity.
@@ -89,35 +92,16 @@ ExtensionsMenuItemView::ExtensionsMenuItemView(
       l10n_util::GetStringUTF16(IDS_EXTENSIONS_MENU_CONTEXT_MENU_TOOLTIP));
   context_menu_button->SetButtonController(
       std::make_unique<views::MenuButtonController>(
-          context_menu_button.get(), this,
+          context_menu_button.get(),
+          base::BindRepeating(&ExtensionsMenuItemView::ContextMenuPressed,
+                              base::Unretained(this)),
           std::make_unique<views::Button::DefaultButtonControllerDelegate>(
               context_menu_button.get())));
-
-  context_menu_button_ = context_menu_button.get();
-  AddChildView(std::move(context_menu_button));
+  context_menu_button_ = AddChildView(std::move(context_menu_button));
 }
 
 ExtensionsMenuItemView::~ExtensionsMenuItemView() = default;
 
-void ExtensionsMenuItemView::ButtonPressed(views::Button* sender,
-                                           const ui::Event& event) {
-  if (sender->GetID() == EXTENSION_PINNING) {
-    base::RecordAction(
-        base::UserMetricsAction("Extensions.Toolbar.PinButtonPressed"));
-    model_->SetActionVisibility(controller_->GetId(), !IsPinned());
-    return;
-  } else if (sender->GetID() == EXTENSION_CONTEXT_MENU) {
-    base::RecordAction(base::UserMetricsAction(
-        "Extensions.Toolbar.MoreActionsButtonPressedFromMenu"));
-    // TODO(crbug.com/998298): Cleanup the menu source type.
-    context_menu_controller_->ShowContextMenuForViewImpl(
-        sender, sender->GetMenuPosition(),
-        ui::MenuSourceType::MENU_SOURCE_MOUSE);
-    return;
-  }
-  NOTREACHED();
-}
-
 const char* ExtensionsMenuItemView::GetClassName() const {
   return kClassName;
 }
@@ -160,9 +144,22 @@ bool ExtensionsMenuItemView::IsContextMenuRunning() const {
 
 bool ExtensionsMenuItemView::IsPinned() const {
   // |model_| can be null in unit tests.
-  if (!model_)
-    return false;
-  return model_->IsActionPinned(controller_->GetId());
+  return model_ && model_->IsActionPinned(controller_->GetId());
+}
+
+void ExtensionsMenuItemView::ContextMenuPressed() {
+  base::RecordAction(base::UserMetricsAction(
+      "Extensions.Toolbar.MoreActionsButtonPressedFromMenu"));
+  // TODO(crbug.com/998298): Cleanup the menu source type.
+  context_menu_controller_->ShowContextMenuForViewImpl(
+      context_menu_button_, context_menu_button_->GetMenuPosition(),
+      ui::MenuSourceType::MENU_SOURCE_MOUSE);
+}
+
+void ExtensionsMenuItemView::PinButtonPressed() {
+  base::RecordAction(
+      base::UserMetricsAction("Extensions.Toolbar.PinButtonPressed"));
+  model_->SetActionVisibility(controller_->GetId(), !IsPinned());
 }
 
 ExtensionsMenuButton*

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

@@ -7,7 +7,6 @@
 
 #include <memory>
 
-#include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 class Browser;
@@ -24,8 +23,7 @@ class ImageButton;
 // particular extension. Includes information about the extension in addition to
 // a button to pin the extension to the toolbar and a button for accessing the
 // associated context menu.
-class ExtensionsMenuItemView : public views::View,
-                               public views::ButtonListener {
+class ExtensionsMenuItemView : public views::View {
  public:
   static constexpr int kMenuItemHeightDp = 40;
   static constexpr gfx::Size kIconSize{28, 28};
@@ -39,9 +37,6 @@ class ExtensionsMenuItemView : public views::View,
   ExtensionsMenuItemView& operator=(const ExtensionsMenuItemView&) = delete;
   ~ExtensionsMenuItemView() override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // views::View:
   const char* GetClassName() const override;
   void OnThemeChanged() override;
@@ -49,9 +44,11 @@ class ExtensionsMenuItemView : public views::View,
   void UpdatePinButton();
 
   bool IsContextMenuRunning() const;
-
   bool IsPinned() const;
 
+  void ContextMenuPressed();
+  void PinButtonPressed();
+
   ToolbarActionViewController* view_controller() { return controller_.get(); }
   const ToolbarActionViewController* view_controller() const {
     return controller_.get();

chrome/browser/ui/views/extensions/extensions_menu_test_util.cc

@@ -22,6 +22,7 @@
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/test/button_test_api.h"
 #include "ui/views/view.h"
 
 // A view wrapper class that owns the ExtensionsToolbarContainer.
@@ -111,10 +112,7 @@ void ExtensionsMenuTestUtil::Press(int index) {
 
   ui::MouseEvent event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                        ui::EventTimeForNow(), 0, 0);
-  // ExtensionsMenuButton::ButtonPressed() is private; workaround by casting to
-  // to a ButtonListener.
-  static_cast<views::ButtonListener*>(primary_button)
-      ->ButtonPressed(primary_button, event);
+  views::test::ButtonTestApi(primary_button).NotifyClick(event);
 }
 
 std::string ExtensionsMenuTestUtil::GetExtensionId(int index) {

chrome/browser/ui/views/extensions/extensions_menu_view.cc

@@ -55,15 +55,6 @@ ExtensionsMenuItemView* GetAsMenuItemView(views::View* view) {
 
 }  // namespace
 
-ExtensionsMenuView::ButtonListener::ButtonListener(Browser* browser)
-    : browser_(browser) {}
-
-void ExtensionsMenuView::ButtonListener::ButtonPressed(views::Button* sender,
-                                                       const ui::Event& event) {
-  DCHECK_EQ(sender->GetID(), EXTENSIONS_SETTINGS_ID);
-  chrome::ShowExtensions(browser_, std::string());
-}
-
 ExtensionsMenuView::ExtensionsMenuView(
     views::View* anchor_view,
     Browser* browser,
@@ -76,7 +67,6 @@ ExtensionsMenuView::ExtensionsMenuView(
       allow_pinning_(allow_pinning),
       toolbar_model_(ToolbarActionsModel::Get(browser_->profile())),
       toolbar_model_observer_(this),
-      button_listener_(browser_),
       cant_access_{nullptr, nullptr,
                    IDS_EXTENSIONS_MENU_CANT_ACCESS_SITE_DATA_SHORT,
                    IDS_EXTENSIONS_MENU_CANT_ACCESS_SITE_DATA,
@@ -154,7 +144,7 @@ void ExtensionsMenuView::Populate() {
   constexpr int kSettingsIconSize = 16;
   auto footer = CreateBubbleMenuItem(
       EXTENSIONS_SETTINGS_ID, l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSION),
-      &button_listener_);
+      base::BindRepeating(&chrome::ShowExtensions, browser_, std::string()));
   footer->SetImage(
       views::Button::STATE_NORMAL,
       gfx::CreateVectorIcon(vector_icons::kSettingsIcon, kSettingsIconSize,

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

@@ -15,7 +15,6 @@
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
-#include "ui/views/controls/button/button.h"
 
 namespace views {
 class Button;
@@ -104,18 +103,6 @@ class ExtensionsMenuView : public views::BubbleDialogDelegateView,
   // the view directly is more friendly to unit test setups.
   static base::AutoReset<bool> AllowInstancesForTesting();
 
- private:
-  class ButtonListener : public views::ButtonListener {
-   public:
-    explicit ButtonListener(Browser* browser);
-
-    // views::ButtonListener:
-    void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
-   private:
-    Browser* const browser_;
-  };
-
   // A "section" within the menu, based on the extension's current access to
   // the page.
   struct Section {
@@ -178,7 +165,6 @@ class ExtensionsMenuView : public views::BubbleDialogDelegateView,
   ToolbarActionsModel* const toolbar_model_;
   ScopedObserver<ToolbarActionsModel, ToolbarActionsModel::Observer>
       toolbar_model_observer_;
-  ButtonListener button_listener_;
   std::vector<ExtensionsMenuItemView*> extensions_menu_items_;
 
   views::Button* manage_extensions_button_for_testing_ = nullptr;

chrome/browser/ui/views/extensions/extensions_toolbar_button.cc

@@ -23,12 +23,14 @@
 ExtensionsToolbarButton::ExtensionsToolbarButton(
     Browser* browser,
     ExtensionsToolbarContainer* extensions_container)
-    : ToolbarButton(this),
+    : ToolbarButton(nullptr),
       browser_(browser),
       extensions_container_(extensions_container) {
   std::unique_ptr<views::MenuButtonController> menu_button_controller =
       std::make_unique<views::MenuButtonController>(
-          this, this,
+          this,
+          base::BindRepeating(&ExtensionsToolbarButton::ButtonPressed,
+                              base::Unretained(this)),
           std::make_unique<views::Button::DefaultButtonControllerDelegate>(
               this));
   menu_button_controller_ = menu_button_controller.get();
@@ -90,19 +92,6 @@ void ExtensionsToolbarButton::UpdateIcon() {
                     extensions_container_->GetIconColor(), GetIconSize()));
 }
 
-void ExtensionsToolbarButton::ButtonPressed(views::Button* sender,
-                                            const ui::Event& event) {
-  if (ExtensionsMenuView::IsShowing()) {
-    ExtensionsMenuView::Hide();
-    return;
-  }
-  pressed_lock_ = menu_button_controller_->TakeLock();
-  base::RecordAction(base::UserMetricsAction("Extensions.Toolbar.MenuOpened"));
-  ExtensionsMenuView::ShowBubble(this, browser_, extensions_container_,
-                                 extensions_container_->CanShowIconInToolbar())
-      ->AddObserver(this);
-}
-
 void ExtensionsToolbarButton::OnWidgetDestroying(views::Widget* widget) {
   widget->RemoveObserver(this);
   pressed_lock_.reset();
@@ -113,3 +102,15 @@ int ExtensionsToolbarButton::GetIconSize() const {
   return (touch_ui && !browser_->app_controller()) ? kDefaultTouchableIconSize
                                                    : kDefaultIconSize;
 }
+
+void ExtensionsToolbarButton::ButtonPressed() {
+  if (ExtensionsMenuView::IsShowing()) {
+    ExtensionsMenuView::Hide();
+    return;
+  }
+  pressed_lock_ = menu_button_controller_->TakeLock();
+  base::RecordAction(base::UserMetricsAction("Extensions.Toolbar.MenuOpened"));
+  ExtensionsMenuView::ShowBubble(this, browser_, extensions_container_,
+                                 extensions_container_->CanShowIconInToolbar())
+      ->AddObserver(this);
+}

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

@@ -18,7 +18,6 @@ class ExtensionsToolbarContainer;
 // Button in the toolbar that provides access to the corresponding extensions
 // menu.
 class ExtensionsToolbarButton : public ToolbarButton,
-                                public views::ButtonListener,
                                 public views::WidgetObserver {
  public:
   ExtensionsToolbarButton(Browser* browser,
@@ -34,15 +33,14 @@ class ExtensionsToolbarButton : public ToolbarButton,
   const char* GetClassName() const override;
   void UpdateIcon() override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // views::WidgetObserver:
   void OnWidgetDestroying(views::Widget* widget) override;
 
  private:
   int GetIconSize() const;
 
+  void ButtonPressed();
+
   // A lock to keep the button pressed when a popup is visible.
   std::unique_ptr<views::MenuButtonController::PressedLock> pressed_lock_;
 

chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

@@ -62,13 +62,6 @@ void ScrollableView::Layout() {
   views::View::Layout();
 }
 
-std::unique_ptr<views::LabelButton> CreateAuxiliaryButton(
-    views::ButtonListener* listener,
-    const base::string16& label) {
-  return label.empty() ? nullptr
-                       : std::make_unique<views::MdTextButton>(listener, label);
-}
-
 }  // namespace
 
 MediaGalleriesDialogViews::MediaGalleriesDialogViews(
@@ -85,8 +78,16 @@ MediaGalleriesDialogViews::MediaGalleriesDialogViews(
   SetShowCloseButton(false);
   SetTitle(controller_->GetHeader());
 
-  auxiliary_button_ = SetExtraView(
-      CreateAuxiliaryButton(this, controller_->GetAuxiliaryButtonText()));
+  base::string16 label = controller_->GetAuxiliaryButtonText();
+  if (!label.empty()) {
+    auxiliary_button_ = SetExtraView(std::make_unique<views::MdTextButton>(
+        base::BindRepeating(
+            &MediaGalleriesDialogViews::ButtonPressed, base::Unretained(this),
+            base::BindRepeating(
+                &MediaGalleriesDialogController::DidClickAuxiliaryButton,
+                base::Unretained(controller_))),
+        label));
+  }
 
   InitChildViews();
   if (ControllerHasWebContents()) {
@@ -221,12 +222,19 @@ bool MediaGalleriesDialogViews::AddOrUpdateGallery(
     return false;
   }
 
-  MediaGalleryCheckboxView* gallery_view = new MediaGalleryCheckboxView(
-      gallery.pref_info, trailing_vertical_space, this, this);
+  auto* gallery_view =
+      container->AddChildView(std::make_unique<MediaGalleryCheckboxView>(
+          gallery.pref_info, trailing_vertical_space, this));
+  gallery_view->checkbox()->set_callback(base::BindRepeating(
+      &MediaGalleriesDialogViews::ButtonPressed, base::Unretained(this),
+      base::BindRepeating(
+          [](MediaGalleriesDialogController* controller,
+             MediaGalleryPrefId pref_id, views::Checkbox* checkbox) {
+            controller->DidToggleEntry(pref_id, checkbox->GetChecked());
+          },
+          controller_, gallery.pref_info.pref_id, gallery_view->checkbox())));
   gallery_view->checkbox()->SetChecked(gallery.selected);
-  container->AddChildView(gallery_view);
   checkbox_map_[gallery.pref_info.pref_id] = gallery_view;
-
   return true;
 }
 
@@ -255,28 +263,6 @@ ui::ModalType MediaGalleriesDialogViews::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
-void MediaGalleriesDialogViews::ButtonPressed(views::Button* sender,
-                                              const ui::Event& /* event */) {
-  confirm_available_ = true;
-
-  if (ControllerHasWebContents())
-    DialogModelChanged();
-
-  if (sender == auxiliary_button_) {
-    controller_->DidClickAuxiliaryButton();
-    return;
-  }
-
-  for (CheckboxMap::const_iterator iter = checkbox_map_.begin();
-       iter != checkbox_map_.end(); ++iter) {
-    if (sender == iter->second->checkbox()) {
-      controller_->DidToggleEntry(iter->first,
-                                  iter->second->checkbox()->GetChecked());
-      return;
-    }
-  }
-}
-
 void MediaGalleriesDialogViews::ShowContextMenuForViewImpl(
     views::View* source,
     const gfx::Point& point,
@@ -309,6 +295,15 @@ bool MediaGalleriesDialogViews::ControllerHasWebContents() const {
   return controller_->WebContents() != nullptr;
 }
 
+void MediaGalleriesDialogViews::ButtonPressed(base::RepeatingClosure closure) {
+  confirm_available_ = true;
+
+  if (ControllerHasWebContents())
+    DialogModelChanged();
+
+  closure.Run();
+}
+
 void MediaGalleriesDialogViews::OnMenuClosed() {
   context_menu_runner_.reset();
 }

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

@@ -12,7 +12,6 @@
 #include "base/macros.h"
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h"
 #include "ui/views/context_menu_controller.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
@@ -27,7 +26,6 @@ class MediaGalleryCheckboxView;
 // The media galleries configuration view for Views. It will immediately show
 // upon construction.
 class MediaGalleriesDialogViews : public MediaGalleriesDialog,
-                                  public views::ButtonListener,
                                   public views::ContextMenuController,
                                   public views::DialogDelegate {
  public:
@@ -46,9 +44,6 @@ class MediaGalleriesDialogViews : public MediaGalleriesDialog,
   bool IsDialogButtonEnabled(ui::DialogButton button) const override;
   ui::ModalType GetModalType() const override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // views::ContextMenuController:
   void ShowContextMenuForViewImpl(views::View* source,
                                   const gfx::Point& point,
@@ -60,7 +55,7 @@ class MediaGalleriesDialogViews : public MediaGalleriesDialog,
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, UpdateAdds);
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ForgetDeletes);
 
-  typedef std::map<MediaGalleryPrefId, MediaGalleryCheckboxView*> CheckboxMap;
+  using CheckboxMap = std::map<MediaGalleryPrefId, MediaGalleryCheckboxView*>;
 
   // MediaGalleriesDialog:
   void AcceptDialogForTesting() override;
@@ -82,6 +77,10 @@ class MediaGalleriesDialogViews : public MediaGalleriesDialog,
   // In unit tests, it may not.
   bool ControllerHasWebContents() const;
 
+  // Called when a button is pressed; does common preamble, then runs the
+  // supplied closure to execute the specific details of the particular button.
+  void ButtonPressed(base::RepeatingClosure closure);
+
   // Callback for MenuRunner.
   void OnMenuClosed();
 

chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc

@@ -14,6 +14,7 @@
 #include "components/storage_monitor/storage_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/button/checkbox.h"
+#include "ui/views/test/button_test_api.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
@@ -100,14 +101,13 @@ TEST_F(MediaGalleriesDialogTest, ToggleCheckboxes) {
   views::Checkbox* checkbox = dialog.checkbox_map_[1]->checkbox();
   EXPECT_TRUE(checkbox->GetChecked());
 
-  ui::KeyEvent dummy_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
   EXPECT_CALL(*controller(), DidToggleEntry(1, false));
-  checkbox->SetChecked(false);
-  dialog.ButtonPressed(checkbox, dummy_event);
+  views::test::ButtonTestApi test_api(checkbox);
+  ui::KeyEvent dummy_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
+  test_api.NotifyClick(dummy_event);  // Toggles to unchecked before notifying.
 
   EXPECT_CALL(*controller(), DidToggleEntry(1, true));
-  checkbox->SetChecked(true);
-  dialog.ButtonPressed(checkbox, dummy_event);
+  test_api.NotifyClick(dummy_event);  // Toggles to checked before notifying.
 }
 
 // Tests that UpdateGallery will add a new checkbox, but only if it refers to

chrome/browser/ui/views/extensions/media_gallery_checkbox_view.cc

@@ -26,9 +26,7 @@ const SkColor kDeemphasizedTextColor = SkColorSetRGB(159, 159, 159);
 MediaGalleryCheckboxView::MediaGalleryCheckboxView(
     const MediaGalleryPrefInfo& pref_info,
     int trailing_vertical_space,
-    views::ButtonListener* button_listener,
     views::ContextMenuController* menu_controller) {
-  DCHECK(button_listener != NULL);
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kHorizontal));
   ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
@@ -39,8 +37,8 @@ MediaGalleryCheckboxView::MediaGalleryCheckboxView(
   if (menu_controller)
     set_context_menu_controller(menu_controller);
 
-  checkbox_ =
-      new views::Checkbox(pref_info.GetGalleryDisplayName(), button_listener);
+  checkbox_ = AddChildView(std::make_unique<views::Checkbox>(
+      pref_info.GetGalleryDisplayName(), views::Button::PressedCallback()));
   if (menu_controller)
     checkbox_->set_context_menu_controller(menu_controller);
   checkbox_->SetElideBehavior(gfx::ELIDE_MIDDLE);
@@ -48,7 +46,7 @@ MediaGalleryCheckboxView::MediaGalleryCheckboxView(
   checkbox_->SetTooltipText(tooltip_text);
 
   base::string16 details = pref_info.GetGalleryAdditionalDetails();
-  secondary_text_ = new views::Label(details);
+  secondary_text_ = AddChildView(std::make_unique<views::Label>(details));
   if (menu_controller)
     secondary_text_->set_context_menu_controller(menu_controller);
   secondary_text_->SetVisible(details.length() > 0);
@@ -58,12 +56,9 @@ MediaGalleryCheckboxView::MediaGalleryCheckboxView(
   secondary_text_->SetBorder(views::CreateEmptyBorder(
       0, provider->GetDistanceMetric(DISTANCE_RELATED_CONTROL_HORIZONTAL_SMALL),
       0, 0));
-
-  AddChildView(checkbox_);
-  AddChildView(secondary_text_);
 }
 
-MediaGalleryCheckboxView::~MediaGalleryCheckboxView() {}
+MediaGalleryCheckboxView::~MediaGalleryCheckboxView() = default;
 
 void MediaGalleryCheckboxView::Layout() {
   views::View::Layout();

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

@@ -8,12 +8,12 @@
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 struct MediaGalleryPrefInfo;
 
 namespace views {
-class ButtonListener;
 class Checkbox;
 class ContextMenuController;
 class Label;
@@ -26,16 +26,15 @@ class MediaGalleryCheckboxView : public views::View {
  public:
   MediaGalleryCheckboxView(const MediaGalleryPrefInfo& pref_info,
                            int trailing_vertical_space,
-                           views::ButtonListener* button_listener,
                            views::ContextMenuController* menu_controller);
   ~MediaGalleryCheckboxView() override;
 
-  // Overrides from views::View.
-  void Layout() override;
-
   views::Checkbox* checkbox() { return checkbox_; }
   views::Label* secondary_text() { return secondary_text_; }
 
+  // views::View:
+  void Layout() override;
+
  private:
   // Owned by the parent class (views::View).
   views::Checkbox* checkbox_;