Rework the Button API to be saner in preparation for NativeControl rejiggering.BaseButton->Button, CustomButtonButton->ImageButtonToggleButton->ToggleImageButtonRemoving SetListener (buttons take listener through ctor)Tidy up source files. No functionality changes, just naming and organization.Look at the button classes first, then everything else.

Review URL: http://codereview.chromium.org/46096

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11799 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 16 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 5c95b08..5cf84f0 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -41,7 +41,7 @@
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils.h"
 
-using views::BaseButton;
+using views::CustomButton;
 using views::DropTargetEvent;
 using views::MenuButton;
 using views::MenuItemView;
@@ -190,10 +190,11 @@ static std::wstring CreateToolTipForURLAndTitle(const gfx::Point& screen_loc,
 
 class BookmarkButton : public views::TextButton {
  public:
-  BookmarkButton(const GURL& url,
+  BookmarkButton(views::ButtonListener* listener,
+                 const GURL& url,
                  const std::wstring& title,
                  Profile* profile)
-      : TextButton(title),
+      : TextButton(listener, title),
         url_(url),
         profile_(profile) {
     show_animation_.reset(new SlideAnimation(this));
@@ -210,7 +211,7 @@ class BookmarkButton : public views::TextButton {
     gfx::Point location(x, y);
     ConvertPointToScreen(this, &location);
     *tooltip = CreateToolTipForURLAndTitle(
-        gfx::Point(location.x(), location.y()), url_, GetText(),
+        gfx::Point(location.x(), location.y()), url_, text(),
         profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
     return !tooltip->empty();
   }
@@ -257,10 +258,11 @@ class BookmarkButton : public views::TextButton {
 // button.
 class BookmarkFolderButton : public views::MenuButton {
  public:
-  BookmarkFolderButton(const std::wstring& title,
+  BookmarkFolderButton(views::ButtonListener* listener,
+                       const std::wstring& title,
                        views::ViewMenuDelegate* menu_delegate,
                        bool show_menu_marker)
-      : MenuButton(title, menu_delegate, show_menu_marker) {
+      : MenuButton(listener, title, menu_delegate, show_menu_marker) {
     show_animation_.reset(new SlideAnimation(this));
     if (BookmarkBarView::testing_) {
       // For some reason during testing the events generated by animating
@@ -966,15 +968,16 @@ void BookmarkBarView::Init() {
 
 MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() {
   MenuButton* button = new BookmarkFolderButton(
-      l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_BOOKMARKED), this, false);
+      this, l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_BOOKMARKED), this,
+      false);
   button->SetIcon(GetGroupIcon());
   button->SetContextMenuController(this);
-  button->SetListener(this, kOtherFolderButtonTag);
+  button->set_tag(kOtherFolderButtonTag);
   return button;
 }
 
 MenuButton* BookmarkBarView::CreateOverflowButton() {
-  MenuButton* button = new MenuButton(std::wstring(), this, false);
+  MenuButton* button = new MenuButton(NULL, std::wstring(), this, false);
   button->SetIcon(*ResourceBundle::GetSharedInstance().
                   GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
@@ -1240,9 +1243,9 @@ void BookmarkBarView::RunMenu(views::View* view,
                             anchor_point, false);
 }
 
-void BookmarkBarView::ButtonPressed(views::BaseButton* sender) {
+void BookmarkBarView::ButtonPressed(views::Button* sender) {
   BookmarkNode* node;
-  if (sender->GetTag() == kOtherFolderButtonTag) {
+  if (sender->tag() == kOtherFolderButtonTag) {
     node = model_->other_node();
   } else {
     int index = GetChildIndex(sender);
@@ -1302,17 +1305,16 @@ void BookmarkBarView::ShowContextMenu(View* source,
 
 views::View* BookmarkBarView::CreateBookmarkButton(BookmarkNode* node) {
   if (node->is_url()) {
-    BookmarkButton* button = new BookmarkButton(node->GetURL(),
+    BookmarkButton* button = new BookmarkButton(this,
+                                                node->GetURL(),
                                                 node->GetTitle(),
                                                 GetProfile());
-    button->SetListener(this, 0);
     ConfigureButton(node, button);
     return button;
   } else {
     views::MenuButton* button =
-        new BookmarkFolderButton(node->GetTitle(), this, false);
+        new BookmarkFolderButton(this, node->GetTitle(), this, false);
     button->SetIcon(GetGroupIcon());
-    button->SetListener(this, 0);
     ConfigureButton(node, button);
     return button;
   }
@@ -1643,7 +1645,7 @@ void BookmarkBarView::StartThrobbing() {
       // Node is hidden, animate the overflow button.
       throbbing_view_ = overflow_button_;
     } else {
-      throbbing_view_ = static_cast<BaseButton*>(GetChildViewAt(index));
+      throbbing_view_ = static_cast<CustomButton*>(GetChildViewAt(index));
     }
   } else {
     throbbing_view_ = other_bookmarked_button_;