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, 3 insertions, 3 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 8b42251..14d7c81 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -40,7 +40,7 @@ class MenuItemView;
 class BookmarkBarView : public views::View,
                         public BookmarkModelObserver,
                         public views::ViewMenuDelegate,
-                        public views::BaseButton::ButtonListener,
+                        public views::ButtonListener,
                         public Menu::Delegate,
                         public NotificationObserver,
                         public views::ContextMenuController,
@@ -307,7 +307,7 @@ class BookmarkBarView : public views::View,
 
   // Invoked when a star entry corresponding to a URL on the bookmark bar is
   // pressed. Forwards to the PageNavigator to open the URL.
-  virtual void ButtonPressed(views::BaseButton* sender);
+  virtual void ButtonPressed(views::Button* sender);
 
   // Invoked for this View, one of the buttons or the 'other' button. Shows the
   // appropriate context menu.
@@ -431,7 +431,7 @@ class BookmarkBarView : public views::View,
   // If the bookmark bubble is showing, this is the visible ancestor of the URL.
   // The visible ancestor is either the other_bookmarked_button_,
   // overflow_button_ or a button on the bar.
-  views::BaseButton* throbbing_view_;
+  views::CustomButton* throbbing_view_;
 
   // How many extension toolstrips we have showing in the toolbar.
   int num_extension_toolstrips_;