[MD] Share button code between find bar and download shelf

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"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_stats.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/view_ids.h"
+#include "chrome/browser/ui/views/bar_control_button.h"
 #include "chrome/browser/ui/views/download/download_item_view.h"
 #include "chrome/browser/ui/views/download/download_item_view_md.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/page_navigator.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/material_design/material_design_controller.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/gfx/color_palette.h"
-#include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/mouse_watcher_view_host.h"
 
@@ skipping 92 matching lines @@
                      this) {
   mouse_watcher_.set_notify_on_exit_time(
       base::TimeDelta::FromMilliseconds(kNotifyOnExitTimeMS));
   set_id(VIEW_ID_DOWNLOAD_SHELF);
   parent->AddChildView(this);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   arrow_image_ = new views::ImageView();
   AddChildView(arrow_image_);
-  close_button_ = new views::ImageButton(this);
-  close_button_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     arrow_image_->SetImage(rb.GetImageSkiaNamed(IDR_DOWNLOADS_FAVICON));
 
     views::Link* show_all_view =
         new views::Link(l10n_util::GetStringUTF16(IDS_SHOW_ALL_DOWNLOADS));
     show_all_view->set_listener(this);
     show_all_view_ = show_all_view;
 
+    close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
                             rb.GetImageSkiaNamed(IDR_CLOSE_1));
     close_button_->SetImage(views::CustomButton::STATE_HOVERED,
                             rb.GetImageSkiaNamed(IDR_CLOSE_1_H));
     close_button_->SetImage(views::CustomButton::STATE_PRESSED,
                             rb.GetImageSkiaNamed(IDR_CLOSE_1_P));
   } else {
     views::LabelButton* show_all_view = new views::LabelButton(
         this, l10n_util::GetStringUTF16(IDS_SHOW_ALL_DOWNLOADS_MD));
     show_all_view->SetFocusable(true);
     show_all_view->SetStyle(views::Button::STYLE_BUTTON);
     show_all_view_ = show_all_view;
 
-    // TODO(estade): share this button init code with the find in page bar;
-    // also fix theming.
-    close_button_->SetBorder(views::Border::CreateEmptyBorder(4, 4, 4, 4));
-    close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
-                                     views::ImageButton::ALIGN_MIDDLE);
-    gfx::ImageSkia image = gfx::CreateVectorIcon(gfx::VectorIconId::BAR_CLOSE,
-                                                 16, gfx::kChromeIconGrey);
-    close_button_->SetImage(views::CustomButton::STATE_NORMAL, &image);
+    BarControlButton* close_button = new BarControlButton(this);
+    close_button->SetIcon(gfx::VectorIconId::BAR_CLOSE,
+                          base::Bind(&DownloadShelfView::GetTextColorForIconMd,
+                                     base::Unretained(this)));
+    close_button_ = close_button;
   }
+  close_button_->SetAccessibleName(
+      l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   AddChildView(show_all_view_);
   AddChildView(close_button_);
 
   new_item_animation_.SetSlideDuration(kNewItemAnimationDurationMs);
   shelf_animation_.SetSlideDuration(kShelfAnimationDurationMs);
 }
 
 DownloadShelfView::~DownloadShelfView() {
   parent_->RemoveChildView(this);
 }
@@ skipping 201 matching lines @@
 void DownloadShelfView::UpdateColorsFromTheme() {
   if (show_all_view_ && close_button_ && GetThemeProvider()) {
     set_background(views::Background::CreateSolidBackground(
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR)));
 
     if (!ui::MaterialDesignController::IsModeMaterial()) {
       views::Link* show_all_view = static_cast<views::Link*>(show_all_view_);
       show_all_view->SetBackgroundColor(background()->get_color());
       show_all_view->SetEnabledColor(
           GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
+
+      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+      close_button_->SetBackground(
+          GetThemeProvider()->GetColor(ThemeProperties::COLOR_TAB_TEXT),
+          rb.GetImageSkiaNamed(IDR_CLOSE_1),
+          rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
     }
-
-    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    set_background(views::Background::CreateSolidBackground(
-        GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR)));
-    close_button_->SetBackground(
-        GetThemeProvider()->GetColor(ThemeProperties::COLOR_TAB_TEXT),
-        rb.GetImageSkiaNamed(IDR_CLOSE_1),
-        rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
   }
 }
 
 void DownloadShelfView::OnThemeChanged() {
   UpdateColorsFromTheme();
 }
 
 void DownloadShelfView::LinkClicked(views::Link* source, int event_flags) {
   chrome::ShowDownloads(browser_);
 }
@@ skipping 68 matching lines @@
       return false;
   }
   return true;
 }
 
 content::DownloadItem* DownloadShelfView::GetDownloadItemForView(size_t i) {
   if (ui::MaterialDesignController::IsModeMaterial())
     return static_cast<DownloadItemViewMd*>(download_views_[i])->download();
   return static_cast<DownloadItemView*>(download_views_[i])->download();
 }
+
+SkColor DownloadShelfView::GetTextColorForIconMd() {
+  return DownloadItemViewMd::GetTextColorForThemeProvider(GetThemeProvider());
+}