[UI Views] Don't allow a ButtonListener and a MenuButtonListener

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 143 matching lines @@
 // Width of the separator between the recently bookmarked button and the
 // overflow indicator, indexed by MD mode.
 static const int kSeparatorWidth[] = {4, 9, 9};
 
 // Starting x-coordinate of the separator line within a separator.
 static const int kSeparatorStartX = 2;
 
 // Left-padding for the instructional text.
 static const int kInstructionsPadding = 6;
 
-// Tag for the 'Other bookmarks' button.
-static const int kOtherFolderButtonTag = 1;
-
 // Tag for the 'Apps Shortcut' button.
 static const int kAppsShortcutButtonTag = 2;
 
 // Preferred padding between text and edge.
 static const int kButtonPaddingHorizontal = 6;
 static const int kButtonPaddingVertical = 4;
 
-// Tag for the 'Managed bookmarks' button.
-static const int kManagedFolderButtonTag = 3;
-// Tag for the 'Supervised bookmarks' button.
-static const int kSupervisedFolderButtonTag = 4;
-
 static const gfx::ElideBehavior kElideBehavior = gfx::FADE_TAIL;
 
 namespace {
 
 // To enable/disable BookmarkBar animations during testing. In production
 // animations are enabled by default.
 bool animations_enabled = true;
 
 gfx::ImageSkia* GetImageSkiaNamed(int id) {
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id);
@@ skipping 106 matching lines @@
 
 // static
 const char ShortcutButton::kViewClassName[] = "ShortcutButton";
 
 // BookmarkFolderButton -------------------------------------------------------
 
 // Buttons used for folders on the bookmark bar, including the 'other folders'
 // button.
 class BookmarkFolderButton : public views::MenuButton {
  public:
-  BookmarkFolderButton(views::ButtonListener* listener,
-                       const base::string16& title,
+  BookmarkFolderButton(const base::string16& title,
                        views::MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
-      : MenuButton(listener, title, menu_button_listener, show_menu_marker) {
+      : MenuButton(title, menu_button_listener, show_menu_marker) {
     SetElideBehavior(kElideBehavior);
     show_animation_.reset(new gfx::SlideAnimation(this));
     if (!animations_enabled) {
       // For some reason during testing the events generated by animating
       // throw off the test. So, don't animate while testing.
       show_animation_->Reset(1);
     } else {
       show_animation_->Show();
     }
   }
@@ skipping 23 matching lines @@
   scoped_ptr<gfx::SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
 };
 
 // OverflowButton (chevron) --------------------------------------------------
 
 class OverflowButton : public views::MenuButton {
  public:
   explicit OverflowButton(BookmarkBarView* owner)
-      : MenuButton(NULL, base::string16(), owner, false), owner_(owner) {}
+      : MenuButton(base::string16(), owner, false), owner_(owner) {}
 
   bool OnMousePressed(const ui::MouseEvent& e) override {
     owner_->StopThrobbing(true);
     return views::MenuButton::OnMousePressed(e);
   }
 
  private:
   BookmarkBarView* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(OverflowButton);
@@ skipping 1090 matching lines @@
     OpenURLParams params(GURL(chrome::kChromeUIAppsURL),
                          Referrer(),
                          disposition_from_event_flags,
                          ui::PAGE_TRANSITION_AUTO_BOOKMARK,
                          false);
     page_navigator_->OpenURL(params);
     RecordBookmarkAppsPageOpen(GetBookmarkLaunchLocation());
     return;
   }
 
-  const BookmarkNode* node;
-  if (sender->tag() == kOtherFolderButtonTag) {
-    node = model_->other_node();
-  } else if (sender->tag() == kManagedFolderButtonTag) {
-    node = managed_->managed_node();
-  } else if (sender->tag() == kSupervisedFolderButtonTag) {
-    node = managed_->supervised_node();
-  } else {
-    int index = GetIndexOf(sender);
-    DCHECK_NE(-1, index);
-    node = model_->bookmark_bar_node()->GetChild(index);
-  }
+  int index = GetIndexOf(sender);
+  DCHECK_NE(-1, index);
+  const BookmarkNode* node = model_->bookmark_bar_node()->GetChild(index);
   DCHECK(page_navigator_);
 
   if (node->is_url()) {
     RecordAppLaunch(browser_->profile(), node->url());
     OpenURLParams params(
         node->url(), Referrer(), disposition_from_event_flags,
         ui::PAGE_TRANSITION_AUTO_BOOKMARK, false);
     page_navigator_->OpenURL(params);
   } else {
     chrome::OpenAll(GetWidget()->GetNativeWindow(), page_navigator_, node,
@@ skipping 134 matching lines @@
   const int bb_count = GetBookmarkButtonCount();
   for (int i = 0; i < bb_count; ++i) {
     if (!GetBookmarkButton(i)->visible())
       return i;
   }
   return bb_count;
 }
 
 MenuButton* BookmarkBarView::CreateOtherBookmarksButton() {
   // Title is set in Loaded.
-  MenuButton* button =
-      new BookmarkFolderButton(this, base::string16(), this, false);
+  MenuButton* button = new BookmarkFolderButton(base::string16(), this, false);
   button->set_id(VIEW_ID_OTHER_BOOKMARKS);
   button->set_context_menu_controller(this);
-  button->set_tag(kOtherFolderButtonTag);
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateManagedBookmarksButton() {
   // Title is set in Loaded.
-  MenuButton* button =
-      new BookmarkFolderButton(this, base::string16(), this, false);
+  MenuButton* button = new BookmarkFolderButton(base::string16(), this, false);
   button->set_id(VIEW_ID_MANAGED_BOOKMARKS);
   button->set_context_menu_controller(this);
-  button->set_tag(kManagedFolderButtonTag);
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateSupervisedBookmarksButton() {
   // Title is set in Loaded.
-  MenuButton* button =
-      new BookmarkFolderButton(this, base::string16(), this, false);
+  MenuButton* button = new BookmarkFolderButton(base::string16(), this, false);
   button->set_id(VIEW_ID_SUPERVISED_BOOKMARKS);
   button->set_context_menu_controller(this);
-  button->set_tag(kSupervisedFolderButtonTag);
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateOverflowButton() {
   MenuButton* button = new OverflowButton(this);
 
   // The overflow button's image contains an arrow and therefore it is a
   // direction sensitive image and we need to flip it if the UI layout is
   // right-to-left.
   //
@@ skipping 11 matching lines @@
 }
 
 views::View* BookmarkBarView::CreateBookmarkButton(const BookmarkNode* node) {
   if (node->is_url()) {
     BookmarkButton* button = new BookmarkButton(
         this, node->url(), node->GetTitle(), browser_->profile());
     ConfigureButton(node, button);
     return button;
   }
   views::MenuButton* button =
-      new BookmarkFolderButton(this, node->GetTitle(), this, false);
+      new BookmarkFolderButton(node->GetTitle(), this, false);
   ConfigureButton(node, button);
   return button;
 }
 
 views::LabelButton* BookmarkBarView::CreateAppsPageShortcutButton() {
   views::LabelButton* button = new ShortcutButton(
       this, l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME));
   button->SetTooltipText(l10n_util::GetStringUTF16(
       IDS_BOOKMARK_BAR_APPS_SHORTCUT_TOOLTIP));
   button->set_id(VIEW_ID_BOOKMARK_BAR_ELEMENT);
@@ skipping 393 matching lines @@
     return;
   apps_page_shortcut_->SetVisible(visible);
   UpdateBookmarksSeparatorVisibility();
   LayoutAndPaint();
 }
 
 void BookmarkBarView::OnShowManagedBookmarksPrefChanged() {
   if (UpdateOtherAndManagedButtonsVisibility())
     LayoutAndPaint();
 }