Add VectorIconButton functionality to ImageButton.

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

 // Copyright 2015 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.
 //
 // A view that implements one download on the Download shelf.
 // Each DownloadItemView contains an application icon, a text label
 // indicating the download's file name, a text label indicating the
 // download's status (such as the number of bytes downloaded so far)
 // and a button for canceling an in progress download, or opening
 // the completed download.
@@ skipping 16 matching lines @@
 #include "base/timer/timer.h"
 #include "chrome/browser/download/download_commands.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/icon_manager.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #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/button.h"
 
 class DownloadShelfView;
 class DownloadShelfContextMenuView;
 
 namespace extensions {
 class ExperienceSamplingEvent;
 }
 
 namespace gfx {
 class Image;
 class ImageSkia;
 class SlideAnimation;
 }
 
 namespace ui {
 class ThemeProvider;
 }
 
 namespace views {
+class ImageButton;
 class Label;
 class MdTextButton;
+class ViewHierarchyChangedDetails;
 }
 
 // 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::ButtonListener,
                          public views::ContextMenuController,
                          public content::DownloadItem::Observer,
                          public gfx::AnimationDelegate {
  public:
   DownloadItemView(content::DownloadItem* download, DownloadShelfView* parent);
   ~DownloadItemView() override;
 
   // Timer callback for handling animations
   void UpdateDownloadProgress();
   void StartDownloadProgress();
   void StopDownloadProgress();
 
   // Returns the base color for text on this download item, based on |theme|.
   static SkColor GetTextColorForThemeProvider(const ui::ThemeProvider* theme);
 
-  // IconManager::Client interface.
   void OnExtractIconComplete(gfx::Image* icon);
 
   // Returns the DownloadItem model object belonging to this item.
   content::DownloadItem* download() { return model_.download(); }
 
   // Submits download to download feedback service if the user has approved and
   // the download is suitable for submission, then apply |download_command|.
   // If user hasn't seen SBER opt-in text before, show SBER opt-in dialog first.
   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;
   bool OnMouseDragged(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
   void OnMouseCaptureLost() override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   bool GetTooltipText(const gfx::Point& p,
                       base::string16* tooltip) const override;
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   void OnThemeChanged() override;
+  void ViewHierarchyChanged(
+      const ViewHierarchyChangedDetails& details) 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::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-  SkColor GetVectorIconBaseColor() const override;
 
   // gfx::AnimationDelegate implementation.
   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;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DownloadItemViewDangerousDownloadLabelTest,
                            AdjustTextAndGetSize);
 
   enum State { NORMAL = 0, HOT, PUSHED };
-  class DropDownButton;
 
   enum Mode {
     NORMAL_MODE = 0,  // Showing download item.
     DANGEROUS_MODE,   // Displaying the dangerous download warning.
     MALICIOUS_MODE    // Displaying the malicious download warning.
   };
 
   void OpenDownload();
 
   // Submits the downloaded file to the safebrowsing download feedback service.
@@ skipping 16 matching lines @@
   void DrawStatusText(gfx::Canvas* canvas);
   void DrawFilename(gfx::Canvas* canvas);
   void DrawIcon(gfx::Canvas* canvas);
 
   void LoadIcon();
   void LoadIconIfItemPathChanged();
 
   // Update the button colors based on the current theme.
   void UpdateColorsFromTheme();
 
+  void UpdateDropdownButton();
+
   // Shows the context menu at the specified location. |point| is in the view's
   // coordinate system.
   void ShowContextMenuImpl(const gfx::Rect& rect,
                            ui::MenuSourceType source_type);
 
   // Common code for handling pointer events (i.e. mouse or gesture).
   void HandlePressEvent(const ui::LocatedEvent& event, bool active_event);
   void HandleClickEvent(const ui::LocatedEvent& event, bool active_event);
 
   // Sets the state and triggers a repaint.
@@ skipping 108 matching lines @@
   std::unique_ptr<gfx::SlideAnimation> complete_animation_;
 
   // Progress animation
   base::RepeatingTimer progress_timer_;
 
   // Dangerous mode buttons.
   views::MdTextButton* save_button_;
   views::MdTextButton* discard_button_;
 
   // The drop down button.
-  DropDownButton* dropdown_button_;
+  views::ImageButton* dropdown_button_;
 
   // Dangerous mode label.
   views::Label* dangerous_download_label_;
 
   // Whether the dangerous mode label has been sized yet.
   bool dangerous_download_label_sized_;
 
   // Whether we are currently disabled as part of opening the downloaded file.
   bool disabled_while_opening_;
 
@@ skipping 19 matching lines @@
   std::unique_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
 
   // Method factory used to delay reenabling of the item when opening the
   // downloaded file.
   base::WeakPtrFactory<DownloadItemView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_ITEM_VIEW_H_