Make all text buttons on download shelf work well with themes, not just

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 149 matching lines @@
   RemoveChildView(view);
   delete view;
   if (download_views_.empty())
     Close(AUTOMATIC);
   else if (CanAutoClose())
     mouse_watcher_.Start();
   Layout();
   SchedulePaint();
 }
 
+void DownloadShelfView::ConfigureButtonForTheme(views::MdTextButton* button) {
+  DCHECK(GetThemeProvider());
+
+  button->SetEnabledTextColors(
+      GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
+  // For the normal theme, just use the default button bg color.
+  base::Optional<SkColor> bg_color;
+  if (!ThemeServiceFactory::GetForProfile(browser_->profile())
+          ->UsingDefaultTheme()) {
+    // For custom themes, we have to make up a background color for the
+    // button. Use a slight tint of the shelf background.
+    bg_color = color_utils::BlendTowardOppositeLuma(
+        GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR), 0x10);
+  }
+  button->SetBgColorOverride(bg_color);
+}
+
 views::View* DownloadShelfView::GetDefaultFocusableChild() {
   if (!download_views_.empty())
     return download_views_.back();
 
   return show_all_view_;
 }
 
 void DownloadShelfView::OnPaintBorder(gfx::Canvas* canvas) {
   canvas->FillRect(gfx::Rect(0, 0, width(), 1), kBorderColor);
 }
@@ skipping 123 matching lines @@
                         kCloseAndLinkPadding - show_all_size.width() -
                         kStartPadding;
   if (available_width <= 0)
     return false;
 
   gfx::Size item_size = (*download_views_.rbegin())->GetPreferredSize();
   return item_size.width() < available_width;
 }
 
 void DownloadShelfView::UpdateColorsFromTheme() {
-  if (show_all_view_ && close_button_ && GetThemeProvider()) {
-    const SkColor bg_color =
-        GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR);
-    set_background(views::Background::CreateSolidBackground(bg_color));
-    show_all_view_->SetEnabledTextColors(
-        GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
-    if (ThemeServiceFactory::GetForProfile(browser_->profile())
-            ->UsingDefaultTheme()) {
-      // For the normal theme, just use the default button bg color.
-      show_all_view_->SetBgColorOverride(base::Optional<SkColor>());
-    } else {
-      // For custom themes, we have to make up a background color for the
-      // button. Use a slight tint of the shelf background.
-      show_all_view_->SetBgColorOverride(
-          color_utils::BlendTowardOppositeLuma(bg_color, 0x10));
-    }
-  }
+  if (!GetThemeProvider())
+    return;
+
+  if (show_all_view_)
+    ConfigureButtonForTheme(show_all_view_);
+
+  set_background(views::Background::CreateSolidBackground(
+      GetThemeProvider()->GetColor(ThemeProperties::COLOR_TOOLBAR)));
 }
 
 void DownloadShelfView::OnThemeChanged() {
   UpdateColorsFromTheme();
 }
 
 void DownloadShelfView::LinkClicked(views::Link* source, int event_flags) {
   chrome::ShowDownloads(browser_);
 }
 
@@ skipping 65 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;
 }