menubar view: change from ButtonPressed overrides to callbacks

rogerwang · rogerwang · commit 09b304e718f8 · 2021-01-19T00:20:08.000-07:00
https://chromium-review.googlesource.com/c/chromium/src/+/2456151 https://chromium-review.googlesource.com/c/chromium/src/+/2505880
diff --git a/src/browser/menubar_view.cc b/src/browser/menubar_view.cc
@@ -34,9 +34,9 @@ const char MenuBarView::kViewClassName[] = "BookmarkBarView";
 class MenuBarButton : public views::MenuButton {
  public:
   MenuBarButton(const base::string16& title,
-                views::ButtonListener* menu_button_listener,
+                PressedCallback callback,
                 bool show_menu_marker)
-    : MenuButton(PressedCallback(menu_button_listener, this), title) {
+    : MenuButton(std::move(callback), title) {
     SetElideBehavior(kElideBehavior);
   }
 
@@ -72,7 +72,10 @@ void MenuBarView::UpdateMenu(ui::MenuModel* model) {
 void MenuBarView::InitView(ui::MenuModel* model) {
   model_ = model;
   for (int i = 0; i < model_->GetItemCount(); i++) {
-    AddChildView(new MenuBarButton(model_->GetLabelAt(i), this, false));
+    AddChildView(new MenuBarButton(model_->GetLabelAt(i),
+                                   base::BindRepeating(&MenuBarView::ButtonPressed,
+                                                       base::Unretained(this), i),
+                                   false));
   }
 }
 
@@ -93,9 +96,9 @@ bool MenuBarView::GetMenuButtonAtLocation(const gfx::Point& loc, ui::MenuModel**
   return false;
 }
 
-void MenuBarView::ButtonPressed(views::Button* view,
+void MenuBarView::ButtonPressed(int button_index,
                                 const ui::Event& event) {
-  int button_index = GetIndexOf(view);
+  views::View* view = children()[button_index];
   DCHECK_NE(-1, button_index);
   ui::MenuModel::ItemType type = model_->GetTypeAt(button_index);
   if (type == ui::MenuModel::TYPE_SUBMENU) {
diff --git a/src/browser/menubar_view.h b/src/browser/menubar_view.h
@@ -26,9 +26,7 @@ namespace nw {
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-class MenuBarView :
-  public views::AccessiblePaneView,
-  public views::ButtonListener {
+class MenuBarView : public views::AccessiblePaneView {
 
  public:
   // The internal view class name.
@@ -46,9 +44,7 @@ class MenuBarView :
 
   bool GetMenuButtonAtLocation(const gfx::Point& loc, ui::MenuModel** model, views::MenuButton** button);
 
-  // views::ButtonListener:
-   void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) override;
+  void ButtonPressed(int index, const ui::Event& event);
 
  private:
   ui::MenuModel* model_;
