Add VectorIconButton functionality to ImageButton.

chrome/browser/ui/views/download/download_shelf_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_shelf_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/page_navigator.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/vector_icons/vector_icons.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/button/image_button_util.h"
 #include "ui/views/controls/button/md_text_button.h"
-#include "ui/views/controls/button/vector_icon_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/mouse_watcher_view_host.h"
 
 using content::DownloadItem;
 
 namespace {
 
 // Max number of download views we'll contain. Any time a view is added and
 // we already have this many download views, one is removed.
 const size_t kMaxDownloadViews = 15;
@@ skipping 39 matching lines @@
   return std::max((target_size - size) / 2, kTopPadding);
 }
 
 }  // namespace
 
 DownloadShelfView::DownloadShelfView(Browser* browser, BrowserView* parent)
     : browser_(browser),
       new_item_animation_(this),
       shelf_animation_(this),
       show_all_view_(nullptr),
-      close_button_(nullptr),
+      close_button_(views::CreateImageButtonWithVectorIconStyling(this)),
       parent_(parent),
       mouse_watcher_(new views::MouseWatcherViewHost(this, gfx::Insets()),
                      this) {
   // Start out hidden: the shelf might be created but never shown in some
   // cases, like when installing a theme. See DownloadShelf::AddDownload().
   SetVisible(false);
 
   mouse_watcher_.set_notify_on_exit_time(
       base::TimeDelta::FromMilliseconds(kNotifyOnExitTimeMS));
   set_id(VIEW_ID_DOWNLOAD_SHELF);
   parent->AddChildView(this);
 
   show_all_view_ = views::MdTextButton::Create(
       this, l10n_util::GetStringUTF16(IDS_SHOW_ALL_DOWNLOADS));
   AddChildView(show_all_view_);
 
-  views::VectorIconButton* close_button = new views::VectorIconButton(this);
-  close_button->SetIcon(ui::kCloseIcon);
-  close_button_ = close_button;
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   AddChildView(close_button_);
+  UpdateCloseButton();

[Evan Stade, 2017/03/17 13:54:44]

is this necessary? We do it when added to the view hierarchy.

[Bret, 2017/03/17 23:41:41]

This one isn't necessary. Removed.

 
   new_item_animation_.SetSlideDuration(kNewItemAnimationDurationMs);
   shelf_animation_.SetSlideDuration(kShelfAnimationDurationMs);
 }
 
 DownloadShelfView::~DownloadShelfView() {
   parent_->RemoveChildView(this);
 }
 
 void DownloadShelfView::AddDownloadView(DownloadItemView* view) {
@@ skipping 197 matching lines @@
 
 void DownloadShelfView::UpdateColorsFromTheme() {
   if (!GetThemeProvider())
     return;
 
   if (show_all_view_)
     ConfigureButtonForTheme(show_all_view_);
 
   set_background(views::Background::CreateSolidBackground(
       GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR)));
+
+  UpdateCloseButton();
 }
 
 void DownloadShelfView::OnThemeChanged() {
   UpdateColorsFromTheme();
 }
 
+void DownloadShelfView::UpdateCloseButton() {
+  views::SetImageFromVectorIcon(
+      close_button_, ui::kCloseIcon,
+      DownloadItemView::GetTextColorForThemeProvider(GetThemeProvider()));
+}
+
 void DownloadShelfView::LinkClicked(views::Link* source, int event_flags) {
   chrome::ShowDownloads(browser_);
 }
 
 void DownloadShelfView::ButtonPressed(
     views::Button* button, const ui::Event& event) {
   if (button == close_button_)
     Close(USER_ACTION);
   else if (button == show_all_view_)
     chrome::ShowDownloads(browser_);
   else
     NOTREACHED();
 }
 
-SkColor DownloadShelfView::GetVectorIconBaseColor() const {
-  return DownloadItemView::GetTextColorForThemeProvider(GetThemeProvider());
-}
-
 bool DownloadShelfView::IsShowing() const {
   return visible() && shelf_animation_.IsShowing();
 }
 
 bool DownloadShelfView::IsClosing() const {
   return shelf_animation_.IsClosing();
 }
 
 void DownloadShelfView::DoOpen() {
   SetVisible(true);
@@ skipping 53 matching lines @@
   SetVisible(false);
 }
 
 bool DownloadShelfView::CanAutoClose() {
   for (size_t i = 0; i < download_views_.size(); ++i) {
     if (!download_views_[i]->download()->GetOpened())
       return false;
   }
   return true;
 }