Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/download/download_shelf_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/views/accessible_pane_view.h"
-#include "ui/views/controls/button/vector_icon_button_delegate.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/mouse_watcher.h"
 
 class Browser;
 class BrowserView;
 class DownloadItemView;
 
 namespace content {
 class DownloadItem;
 class PageNavigator;
 }
 
 namespace views {
 class ImageButton;
 class MdTextButton;
 }
 
 // DownloadShelfView is a view that contains individual views for each download,
 // as well as a close button and a link to show all downloads.
 //
 // DownloadShelfView does not hold an infinite number of download views, rather
 // it'll automatically remove views once a certain point is reached.
 class DownloadShelfView : public views::AccessiblePaneView,
                           public gfx::AnimationDelegate,
                           public DownloadShelf,
-                          public views::VectorIconButtonDelegate,
+                          public views::ButtonListener,
                           public views::LinkListener,
                           public views::MouseWatcherListener {
  public:
   DownloadShelfView(Browser* browser, BrowserView* parent);
   ~DownloadShelfView() override;
 
   // Sent from the DownloadItemView when the user opens an item.
   void OpenedDownload();
 
   // Returns the relevant containing object that can load pages.
   // i.e. the |browser_|.
   content::PageNavigator* GetNavigator();
 
   // Returns the parent_.
   BrowserView* get_parent() { return parent_; }
 
-  // Implementation of View.
+  // views::View:
   gfx::Size GetPreferredSize() const override;
   void Layout() override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
 
-  // Implementation of gfx::AnimationDelegate.
+  // gfx::AnimationDelegate.
   void AnimationProgressed(const gfx::Animation* animation) override;
   void AnimationEnded(const gfx::Animation* animation) override;
 
-  // Implementation of views::LinkListener.
+  // views::LinkListener.
   // Invoked when the user clicks the 'show all downloads' link button.
   void LinkClicked(views::Link* source, int event_flags) override;
 
-  // Implementation of VectorIconButtonDelegate.
+  // views::ButtonListener:
   // Invoked when the user clicks the close button. Asks the browser to
   // hide the download shelf.
   void ButtonPressed(views::Button* button, const ui::Event& event) override;
-  SkColor GetVectorIconBaseColor() const override;
 
-  // Implementation of DownloadShelf.
+  // DownloadShelf:
   bool IsShowing() const override;
   bool IsClosing() const override;
   Browser* browser() const override;
 
-  // Implementation of MouseWatcherListener override.
+  // views::MouseWatcherListener:
   void MouseMovedOutOfHost() override;
 
   // Removes a specified download view. The supplied view is deleted after
   // it's removed.
   void RemoveDownloadView(views::View* view);
 
   // Updates |button| according to the active theme.
   void ConfigureButtonForTheme(views::MdTextButton* button);
 
  protected:
-  // Implementation of DownloadShelf.
+  // DownloadShelf:
   void DoAddDownload(content::DownloadItem* download) override;
   void DoOpen() override;
   void DoClose(CloseReason reason) override;
   void DoHide() override;
   void DoUnhide() override;
 
-  // From AccessiblePaneView
+  // views::AccessiblePaneView:
   views::View* GetDefaultFocusableChild() override;
 
  private:
   // Adds a View representing a download to this DownloadShelfView.
   // DownloadShelfView takes ownership of the View, and will delete it as
   // necessary.
   void AddDownloadView(DownloadItemView* view);
 
   // Paints the border.
   void OnPaintBorder(gfx::Canvas* canvas) override;
 
   // Returns true if the shelf is wide enough to show the first download item.
   bool CanFitFirstDownloadItem();
 
   // Called on theme change.
   void UpdateColorsFromTheme();
 
-  // Overridden from views::View.
+  // views::View:
   void OnThemeChanged() override;
 
+  void UpdateCloseButton();
+
   // Called when the "close shelf" animation ended.
   void Closed();
 
   // Returns true if we can auto close. We can auto-close if all the items on
   // the shelf have been opened.
   bool CanAutoClose();
 
   // Returns the color of text for the shelf (used for deriving icon color).
   SkColor GetTextColorForIconMd();
 
@@ skipping 19 matching lines @@
 
   // The window this shelf belongs to.
   BrowserView* parent_;
 
   views::MouseWatcher mouse_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadShelfView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_