MD - Fix coloring of buttons on DL shelf.

ui/native_theme/native_theme_dark_aura.cc

 // Copyright 2015 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 "ui/native_theme/native_theme_dark_aura.h"
 
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 
 namespace ui {
 
 NativeThemeDarkAura* NativeThemeDarkAura::instance() {
   CR_DEFINE_STATIC_LOCAL(NativeThemeDarkAura, s_native_theme, ());
   return &s_native_theme;
 }
 
 SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
   if (!ui::MaterialDesignController::IsModeMaterial())
     return NativeThemeAura::GetSystemColor(color_id);
 
+  static const SkColor kButtonEnabledColor = SK_ColorWHITE;
   static const SkColor kLinkEnabledColor = gfx::kGoogleBlue300;
 
   static const SkColor kTextfieldDefaultColor = SK_ColorWHITE;
   static const SkColor kTextfieldDefaultBackground =
       SkColorSetRGB(0x62, 0x62, 0x62);
   static const SkColor kTextfieldSelectionBackgroundFocused =
       SkColorSetA(gfx::kGoogleBlue700, 0xCC);
 
   static const SkColor kResultsTableNormalBackground =
       SkColorSetRGB(0x28, 0x28, 0x28);
   static const SkColor kResultsTableText = SK_ColorWHITE;
   static const SkColor kResultsTableDimmedText =
       SkColorSetA(kResultsTableText, 0x80);
 
   switch (color_id) {
     // Button
+    case kColorId_ButtonEnabledColor:
+      return kButtonEnabledColor;
     case kColorId_CallToActionColor:
       return kLinkEnabledColor;
 
     // Link
     case kColorId_LinkEnabled:
     case kColorId_LinkPressed:
       return kLinkEnabledColor;
 
     // Textfield
     case kColorId_TextfieldDefaultColor:
@@ skipping 14 matching lines @@
     case kColorId_ResultsTableNormalDimmedText:
     case kColorId_ResultsTableHoveredDimmedText:
     case kColorId_ResultsTableSelectedDimmedText:
       return kResultsTableDimmedText;
 
     // FocusableBorder
     case kColorId_FocusedBorderColor:
       return gfx::kGoogleBlue300;
 
     // Intentional pass-throughs to NativeThemeAura.
-    case kColorId_ButtonEnabledColor:
     case kColorId_TextOnCallToActionColor:
     case kColorId_ResultsTableHoveredBackground:
     case kColorId_ResultsTableSelectedBackground:
     case kColorId_ResultsTableNormalUrl:
     case kColorId_ResultsTableHoveredUrl:
     case kColorId_ResultsTableSelectedUrl:
       return NativeThemeAura::GetSystemColor(color_id);
 
     // Any other color is not defined and shouldn't be used in a dark theme.
     case kColorId_WindowBackground:
@@ skipping 59 matching lines @@
 
   NOTREACHED();
   return gfx::kPlaceholderColor;
 }
 
 NativeThemeDarkAura::NativeThemeDarkAura() {}
 
 NativeThemeDarkAura::~NativeThemeDarkAura() {}
 
 }  // namespace ui