MD - Fix coloring of buttons on DL 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"
@@ skipping 116 matching lines @@
 }
 
 }  // namespace
 
 DownloadShelfView::DownloadShelfView(Browser* browser, BrowserView* parent)
     : browser_(browser),
       new_item_animation_(this),
       shelf_animation_(this),
       arrow_image_(nullptr),
       show_all_view_(nullptr),
+      show_all_view_md_(nullptr),
       close_button_(nullptr),
       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));
@@ skipping 13 matching lines @@
     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 =
-        views::MdTextButton::CreateStandardButton(
-            this, l10n_util::GetStringUTF16(IDS_SHOW_ALL_DOWNLOADS_MD));
-    show_all_view_ = show_all_view;
+    show_all_view_md_ = views::MdTextButton::CreateMdButton(
+        this, l10n_util::GetStringUTF16(IDS_SHOW_ALL_DOWNLOADS_MD));
+    show_all_view_ = show_all_view_md_;
 
     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_);
@@ skipping 201 matching lines @@
 
   gfx::Size item_size = (*download_views_.rbegin())->GetPreferredSize();
   return item_size.width() < available_width;
 }
 
 void DownloadShelfView::UpdateColorsFromTheme() {
   if (show_all_view_ && close_button_ && GetThemeProvider()) {
     set_background(views::Background::CreateSolidBackground(
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR)));
 
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
+    if (ui::MaterialDesignController::IsModeMaterial()) {
+      show_all_view_md_->SetEnabledTextColors(
+          GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
+    } else {
       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));
@@ skipping 83 matching lines @@
 
 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());
 }