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

diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
index 36b2070..1cd7907 100644
--- a/chrome/browser/views/download_shelf_view.h
+++ b/chrome/browser/views/download_shelf_view.h
@@ -11,6 +11,7 @@
 #include "chrome/views/link.h"
 
 namespace views {
+class ImageButton;
 class ImageView;
 }
 
@@ -28,7 +29,7 @@ class DownloadAnimation;
 // it'll automatically remove views once a certain point is reached.
 class DownloadShelfView : public DownloadShelf,
                           public views::View,
-                          public views::BaseButton::ButtonListener,
+                          public views::ButtonListener,
                           public views::LinkController,
                           public AnimationDelegate {
  public:
@@ -50,7 +51,7 @@ class DownloadShelfView : public DownloadShelf,
   // Implementation of ButtonListener.
   // Invoked when the user clicks the close button. Asks the browser to
   // hide the download shelf.
-  virtual void ButtonPressed(views::BaseButton* button);
+  virtual void ButtonPressed(views::Button* button);
 
   // Implementation of DownloadShelf.
   virtual void AddDownload(BaseDownloadItemModel* download_model);
@@ -90,7 +91,7 @@ class DownloadShelfView : public DownloadShelf,
 
   // Button for closing the downloads. This is contained as a child, and
   // deleted by View.
-  views::Button* close_button_;
+  views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadShelfView);
 };