Add VectorIconButton functionality to ImageButton.

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

Index: chrome/browser/ui/views/download/download_item_view.h
diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
index 1b28c4f5d94c4a9095fbee6a7deb203b165078ee..ee170d4476f79b36628d9fd3f9cbc8f44dc02f9d 100644
--- a/chrome/browser/ui/views/download/download_item_view.h
+++ b/chrome/browser/ui/views/download/download_item_view.h
@@ -34,7 +34,7 @@
 #include "ui/gfx/font_list.h"
 #include "ui/views/animation/ink_drop_host_view.h"
 #include "ui/views/context_menu_controller.h"
-#include "ui/views/controls/button/vector_icon_button_delegate.h"
+#include "ui/views/controls/button/image_button.h"
 
 class DownloadShelfView;
 class DownloadShelfContextMenuView;
@@ -61,7 +61,7 @@ class MdTextButton;
 // Represents a single download item on the download shelf. Encompasses an icon,
 // text, malicious download warnings, etc.
 class DownloadItemView : public views::InkDropHostView,
-                         public views::VectorIconButtonDelegate,
+                         public views::ImageButtonDelegate,
                          public views::ContextMenuController,
                          public content::DownloadItem::Observer,
                          public gfx::AnimationDelegate {
@@ -89,12 +89,12 @@ class DownloadItemView : public views::InkDropHostView,
   void MaybeSubmitDownloadToFeedbackService(
       DownloadCommands::Command download_command);
 
-  // DownloadItem::Observer methods
+  // content::DownloadItem::Observer:
   void OnDownloadUpdated(content::DownloadItem* download) override;
   void OnDownloadOpened(content::DownloadItem* download) override;
   void OnDownloadDestroyed(content::DownloadItem* download) override;
 
-  // Overridden from views::View:
+  // views::View:
   void Layout() override;
   gfx::Size GetPreferredSize() const override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
@@ -107,30 +107,30 @@ class DownloadItemView : public views::InkDropHostView,
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   void OnThemeChanged() override;
 
-  // Overridden from view::InkDropHostView:
+  // view::InkDropHostView:
   void AddInkDropLayer(ui::Layer* ink_drop_layer) override;
   std::unique_ptr<views::InkDrop> CreateInkDrop() override;
   std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
   std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
       const override;
 
-  // Overridden from ui::EventHandler:
+  // ui::EventHandler:
   void OnGestureEvent(ui::GestureEvent* event) override;
 
-  // Overridden from views::ContextMenuController.
+  // views::ContextMenuController.
   void ShowContextMenuForView(View* source,
                               const gfx::Point& point,
                               ui::MenuSourceType source_type) override;
 
-  // VectorIconButtonDelegate implementation.
+  // views::ImageButtonDelegate:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-  SkColor GetVectorIconBaseColor() const override;
+  SkColor GetVectorIconColor() const override;
 
-  // gfx::AnimationDelegate implementation.
+  // gfx::AnimationDelegate:
   void AnimationProgressed(const gfx::Animation* animation) override;
 
  protected:
-  // Overridden from views::View:
+  // views::View:
   void OnPaint(gfx::Canvas* canvas) override;
   void OnFocus() override;
   void OnBlur() override;