Update dialog close buttons to use vector icons and ripples.

chrome/browser/ui/views/download/download_item_view_md.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_md.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 17 matching lines @@
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/download/drag_download_item.h"
 #include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/download_feedback_service.h"
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/themes/theme_properties.h"
-#include "chrome/browser/ui/views/bar_control_button.h"
 #include "chrome/browser/ui/views/download/download_feedback_dialog_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/download_danger_type.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #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/gfx/vector_icons_public.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/md_text_button.h"
+#include "ui/views/controls/button/vector_icon_button.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 68 matching lines @@
 
  private:
   SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(SeparatorBorder);
 };
 
 }  // namespace
 
 // Allows the DownloadItemViewMd to control the InkDrop on the drop down button.
-class DownloadItemViewMd::DropDownButton : public BarControlButton {
+class DownloadItemViewMd::DropDownButton : public views::VectorIconButton {
  public:
-  explicit DropDownButton(views::ButtonListener* listener)
-      : BarControlButton(listener) {}
+  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.
-    BarControlButton::AnimateInkDrop(state, nullptr /* event */);
+    views::VectorIconButton::AnimateInkDrop(state, nullptr /* event */);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DropDownButton);
 };
 
 DownloadItemViewMd::DownloadItemViewMd(DownloadItem* download_item,
                                        DownloadShelfView* parent)
     : shelf_(parent),
       status_text_(l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)),
@@ skipping 411 matching lines @@
     } else {
       PossiblySubmitDownloadToFeedbackService(
           shelf_->browser()->profile()->GetPrefs()->GetBoolean(
               prefs::kSafeBrowsingExtendedReportingEnabled));
     }
     return;
   }
   download()->Remove();
 }
 
+SkColor DownloadItemViewMd::GetVectorIconBaseColor() const {
+  return GetTextColor();
+}
+
 void DownloadItemViewMd::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 DownloadItemViewMd::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 256 matching lines @@
   OpenDownload();
 }
 
 void DownloadItemViewMd::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 ? gfx::VectorIconId::FIND_NEXT
-                          : gfx::VectorIconId::FIND_PREV,
-      base::Bind(&DownloadItemViewMd::GetTextColor, base::Unretained(this)));
+  dropdown_button_->SetIcon(new_state == PUSHED ? gfx::VectorIconId::FIND_NEXT
+                                                : gfx::VectorIconId::FIND_PREV);
   if (new_state != dropdown_state_) {
     dropdown_button_->AnimateInkDrop(new_state == PUSHED
                                          ? views::InkDropState::ACTIVATED
                                          : views::InkDropState::DEACTIVATED);
   }
   dropdown_button_->OnThemeChanged();
   dropdown_state_ = new_state;
   SchedulePaint();
 }
 
@@ skipping 233 matching lines @@
     SchedulePaint();
 }
 
 SkColor DownloadItemViewMd::GetTextColor() const {
   return GetTextColorForThemeProvider(GetThemeProvider());
 }
 
 SkColor DownloadItemViewMd::GetDimmedTextColor() const {
   return SkColorSetA(GetTextColor(), 0xC7);
 }