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

Bug: 772945
Change-Id: Ifbdd19b49dc253d188eab3b3dafecb3beaf51f0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2456151Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814766}

chrome/browser/ui/views/bookmarks/bookmark_bar_view.h

@@ -23,7 +23,6 @@
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/animation/animation_delegate_views.h"
 #include "ui/views/context_menu_controller.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/menu/menu_types.h"
 #include "ui/views/drag_controller.h"
 
@@ -70,30 +69,6 @@ class BookmarkBarView : public views::AccessiblePaneView,
                         public BookmarkMenuControllerObserver,
                         public bookmarks::BookmarkBubbleObserver {
  public:
-  // TODO(pbos): Get rid of these proxy classes by unifying a single
-  // ButtonPressed to handle all buttons. This class only exists to forward
-  // events into ::OnButtonPressed.
-  class ButtonListener : public views::ButtonListener {
-   public:
-    explicit ButtonListener(BookmarkBarView* parent);
-    void ButtonPressed(views::Button* source, const ui::Event& event) override;
-
-   private:
-    BookmarkBarView* const parent_;
-  };
-
-  // TODO(pbos): Get rid of these proxy classes by unifying a single
-  // ButtonPressed to handle all buttons. This class only exists to forward
-  // events into ::OnMenuButtonPressed.
-  class MenuButtonListener : public views::ButtonListener {
-   public:
-    explicit MenuButtonListener(BookmarkBarView* parent);
-    void ButtonPressed(views::Button* source, const ui::Event& event) override;
-
-   private:
-    BookmarkBarView* const parent_;
-  };
-
   // The internal view class name.
   static const char kViewClassName[];
 
@@ -266,8 +241,11 @@ class BookmarkBarView : public views::AccessiblePaneView,
   // calculating the preferred height.
   void Init();
 
-  void OnButtonPressed(views::Button* sender, const ui::Event& event);
-  void OnMenuButtonPressed(views::Button* sender, const ui::Event& event);
+  void AppsPageShortcutPressed(const ui::Event& event);
+  void OnButtonPressed(const bookmarks::BookmarkNode* node,
+                       const ui::Event& event);
+  void OnMenuButtonPressed(const bookmarks::BookmarkNode* node,
+                           const ui::Event& event);
 
   // NOTE: unless otherwise stated all methods that take an index are in terms
   // of the bookmark bar view. Typically the view index and model index are the
@@ -384,10 +362,6 @@ class BookmarkBarView : public views::AccessiblePaneView,
   // or size_t{-1} if |button| is not a bookmark button from this bar.
   size_t GetIndexForButton(views::View* button);
 
-  // These forward button callbacks into ::On{Menu}ButtonPressed.
-  ButtonListener button_listener_{this};
-  MenuButtonListener menu_button_listener_{this};
-
   // Needed to react to kShowAppsShortcutInBookmarkBar changes.
   PrefChangeRegistrar profile_pref_registrar_;
 

chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

@@ -44,20 +44,6 @@ using bookmarks::BookmarkExpandedStateTracker;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
-namespace {
-
-std::unique_ptr<views::LabelButton> CreateNewFolderButton(
-    views::ButtonListener* listener,
-    bool enabled) {
-  auto new_folder_button = std::make_unique<views::MdTextButton>(
-      listener,
-      l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON));
-  new_folder_button->SetEnabled(enabled);
-  return new_folder_button;
-}
-
-}  // namespace
-
 BookmarkEditorView::BookmarkEditorView(
     Profile* profile,
     const BookmarkNode* parent,
@@ -79,8 +65,11 @@ BookmarkEditorView::BookmarkEditorView(
   SetTitle(details_.GetWindowTitleId());
   SetButtonLabel(ui::DIALOG_BUTTON_OK, l10n_util::GetStringUTF16(IDS_SAVE));
   if (show_tree_) {
-    new_folder_button_ =
-        SetExtraView(CreateNewFolderButton(this, bb_model_->loaded()));
+    new_folder_button_ = SetExtraView(std::make_unique<views::MdTextButton>(
+        base::BindRepeating(&BookmarkEditorView::NewFolderButtonPressed,
+                            base::Unretained(this)),
+        l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON)));
+    new_folder_button_->SetEnabled(bb_model_->loaded());
   }
   set_margins(ChromeLayoutProvider::Get()->GetDialogInsetsForContentType(
       views::CONTROL, views::CONTROL));
@@ -142,13 +131,6 @@ void BookmarkEditorView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   node_data->SetName(l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_TITLE));
 }
 
-void BookmarkEditorView::ButtonPressed(views::Button* sender,
-                                       const ui::Event& event) {
-  DCHECK_EQ(new_folder_button_, sender);
-  DCHECK(tree_view_->GetSelectedNode());
-  NewFolder(tree_model_->AsNode(tree_view_->GetSelectedNode()));
-}
-
 bool BookmarkEditorView::IsCommandIdChecked(int command_id) const {
   return false;
 }
@@ -422,13 +404,14 @@ void BookmarkEditorView::UserInputChanged() {
   DialogModelChanged();
 }
 
+void BookmarkEditorView::NewFolderButtonPressed() {
+  DCHECK(tree_view_->GetSelectedNode());
+  NewFolder(tree_model_->AsNode(tree_view_->GetSelectedNode()));
+}
+
 void BookmarkEditorView::NewFolder(EditorNode* parent) {
   // Create a new entry parented to the given item.
-  if (!parent) {
-    NOTREACHED();
-    return;
-  }
-
+  DCHECK(parent);
   tree_view_->StartEditing(AddNewFolder(parent));
 }
 

chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

@@ -19,7 +19,6 @@
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/models/tree_node_model.h"
 #include "ui/views/context_menu_controller.h"
-#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/controls/tree/tree_view_controller.h"
@@ -46,7 +45,6 @@ class Profile;
 // To use BookmarkEditorView invoke the static show method.
 
 class BookmarkEditorView : public BookmarkEditor,
-                           public views::ButtonListener,
                            public views::TreeViewController,
                            public views::DialogDelegateView,
                            public views::TextfieldController,
@@ -95,9 +93,6 @@ class BookmarkEditorView : public BookmarkEditor,
   bool HandleKeyEvent(views::Textfield* sender,
                       const ui::KeyEvent& key_event) override;
 
-  // views::ButtonListener:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
   // ui::SimpleMenuModel::Delegate:
   bool IsCommandIdChecked(int command_id) const override;
   bool IsCommandIdEnabled(int command_id) const override;
@@ -198,6 +193,8 @@ class BookmarkEditorView : public BookmarkEditor,
   // of Textfields and ok button appropriately.
   void UserInputChanged();
 
+  void NewFolderButtonPressed();
+
   // Creates a new folder as a child of the given node. Starts editing on the
   // new group as well.
   void NewFolder(EditorNode* parent);