Add VectorIconButton functionality to ImageButton.

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

 // 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.
 
 #include "chrome/browser/ui/views/download/download_item_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 44 matching lines @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/vector_icons/vector_icons.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/button/image_button_factory.h"
 #include "ui/views/controls/button/md_text_button.h"
-#include "ui/views/controls/button/vector_icon_button.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::DownloadItem;
 using extensions::ExperienceSamplingEvent;
 
 namespace {
@@ skipping 70 matching lines @@
   }
 
  private:
   SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(SeparatorBorder);
 };
 
 }  // namespace
 
-// Allows the DownloadItemView to control the InkDrop on the drop down button.
-class DownloadItemView::DropDownButton : public views::VectorIconButton {
- public:
-  explicit DropDownButton(views::VectorIconButtonDelegate* delegate)
-      : views::VectorIconButton(delegate) {}
-  ~DropDownButton() override {}
-
-  // Promoted visibility to public.
-  void AnimateInkDrop(views::InkDropState state) {
-    // TODO(bruthig): Plumb in the proper Event.
-    views::VectorIconButton::AnimateInkDrop(state, nullptr /* event */);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(DropDownButton);
-};
-
 DownloadItemView::DownloadItemView(DownloadItem* download_item,
                                    DownloadShelfView* parent)
     : shelf_(parent),
       status_text_(l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)),
       dropdown_state_(NORMAL),
       mode_(NORMAL_MODE),
       dragging_(false),
       starting_drag_(false),
       model_(download_item),
       save_button_(nullptr),
       discard_button_(nullptr),
-      dropdown_button_(new DropDownButton(this)),
+      dropdown_button_(views::CreateVectorImageButton(this)),
       dangerous_download_label_(nullptr),
       dangerous_download_label_sized_(false),
       disabled_while_opening_(false),
       creation_time_(base::Time::Now()),
       time_download_warning_shown_(base::Time()),
       weak_ptr_factory_(this) {
   SetInkDropMode(InkDropMode::ON);
   DCHECK(download());
   download()->AddObserver(this);
   set_context_menu_controller(this);
@@ skipping 185 matching lines @@
   }
 
   if (mode_ != DANGEROUS_MODE) {
     dropdown_button_->SizeToPreferredSize();
     dropdown_button_->SetPosition(
         gfx::Point(width() - dropdown_button_->width() - kEndPadding,
                    (height() - dropdown_button_->height()) / 2));
   }
 }
 
+void DownloadItemView::UpdateDropdownButton() {
+  views::SetImageFromVectorIcon(
+      dropdown_button_,
+      dropdown_state_ == PUSHED ? kCaretDownIcon : kCaretUpIcon,
+      GetTextColor());
+}
+
 gfx::Size DownloadItemView::GetPreferredSize() const {
   int width = 0;
   // We set the height to the height of two rows or text plus margins.
   int child_height = font_list_.GetBaseline() + kVerticalTextPadding +
                      status_font_list_.GetHeight();
 
   if (IsShowingWarningDialog()) {
     // Width.
     width = kStartPadding + kWarningIconSize + kStartPadding +
             dangerous_download_label_->width() + kLabelPadding;
@@ skipping 96 matching lines @@
   node_data->role = ui::AX_ROLE_BUTTON;
   if (model_.IsDangerous())
     node_data->AddStateFlag(ui::AX_STATE_DISABLED);
   else
     node_data->AddStateFlag(ui::AX_STATE_HASPOPUP);
 }
 
 void DownloadItemView::OnThemeChanged() {
   UpdateColorsFromTheme();
   SchedulePaint();
+  UpdateDropdownButton();
+}
+
+void DownloadItemView::ViewHierarchyChanged(
+    const ViewHierarchyChangedDetails& details) {
+  if (details.is_add && details.child == this) {
+    // This is only required because OnThemeChanged is not called when a view is
+    // added as a child.
+    UpdateDropdownButton();
+  }
 }
 
 void DownloadItemView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
   InkDropHostView::AddInkDropLayer(ink_drop_layer);
   // The layer that's added to host the ink drop layer must mask to bounds
   // so the hover effect is clipped while animating open.
   layer()->SetMasksToBounds(true);
 }
 
 std::unique_ptr<views::InkDrop> DownloadItemView::CreateInkDrop() {
@@ skipping 77 matching lines @@
     download()->ValidateDangerousDownload();
     return;
   }
 
   DCHECK_EQ(discard_button_, sender);
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", warning_duration);
   MaybeSubmitDownloadToFeedbackService(DownloadCommands::DISCARD);
   // WARNING: 'this' maybe deleted at this point. Don't access 'this'.
 }
 
-SkColor DownloadItemView::GetVectorIconBaseColor() const {
-  return GetTextColor();
-}
-
 void DownloadItemView::AnimationProgressed(const gfx::Animation* animation) {
   // We don't care if what animation (body button/drop button/complete),
   // is calling back, as they all have to go through the same paint call.
   SchedulePaint();
 }
 
 void DownloadItemView::OnPaint(gfx::Canvas* canvas) {
   // Make sure to draw |this| opaquely. Since the toolbar color can be partially
   // transparent, start with a black backdrop (which is the default initialized
   // color for opaque canvases).
@@ skipping 257 matching lines @@
   OpenDownload();
 }
 
 void DownloadItemView::SetDropdownState(State new_state) {
   // Avoid extra SchedulePaint()s if the state is going to be the same and
   // |dropdown_button_| has already been initialized.
   if (dropdown_state_ == new_state &&
       !dropdown_button_->GetImage(views::CustomButton::STATE_NORMAL).isNull())
     return;
 
-  dropdown_button_->SetIcon(new_state == PUSHED ? kCaretDownIcon
-                                                : kCaretUpIcon);
   if (new_state != dropdown_state_) {
     dropdown_button_->AnimateInkDrop(new_state == PUSHED
                                          ? views::InkDropState::ACTIVATED
-                                         : views::InkDropState::DEACTIVATED);
+                                         : views::InkDropState::DEACTIVATED,
+                                     nullptr);
   }
-  dropdown_button_->OnThemeChanged();
   dropdown_state_ = new_state;
+  UpdateDropdownButton();
   SchedulePaint();
 }
 
 void DownloadItemView::ToggleWarningDialog() {
   if (model_.IsDangerous())
     ShowWarningDialog();
   else
     ClearWarningDialog();
 
   // We need to load the icon now that the download has the real path.
@@ skipping 220 matching lines @@
     SchedulePaint();
 }
 
 SkColor DownloadItemView::GetTextColor() const {
   return GetTextColorForThemeProvider(GetThemeProvider());
 }
 
 SkColor DownloadItemView::GetDimmedTextColor() const {
   return SkColorSetA(GetTextColor(), 0xC7);
 }