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 374 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()) {
+      static_cast<views::LabelButton*>(show_all_view_)

[sky, 2016/06/23 15:28:00]

grumble, static_cast, grumble.
This cast is easy to miss and fragile. How about adding another member, say
show_all_view_md_ this is the LableButton?

[Evan Stade, 2016/06/23 17:05:49]

well hopefully we'll be able to rip out non-md code soon which would obviate the
need for this cast, but I've gone ahead and added the member.

+          ->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());
 }