MD - Fix coloring of buttons on DL shelf.

ui/views/controls/button/md_text_button.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/views/controls/button/md_text_button.h"
 
 #include "base/i18n/case_conversion.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
@@ skipping 125 matching lines @@
   canvas->DrawRoundRect(rect, kFocusBorderCornerRadius, paint);
 }
 
 void MdTextButton::SetCallToAction(bool cta) {
   if (is_cta_ == cta)
     return;
 
   is_cta_ = cta;
   focus_ring_->set_thickness(cta ? kFocusBorderThicknessCta
                                  : kFocusBorderThickness);
-  UpdateColorsFromNativeTheme();
+  UpdateColors();
 }
 
 void MdTextButton::Layout() {
   LabelButton::Layout();
   gfx::Rect focus_bounds = GetLocalBounds();
   focus_bounds.Inset(gfx::Insets(-focus_ring_->thickness()));
   focus_ring_->SetBoundsRect(focus_bounds);
 }
 
 void MdTextButton::OnFocus() {
   LabelButton::OnFocus();
   focus_ring_->SetVisible(true);
 }
 
 void MdTextButton::OnBlur() {
   LabelButton::OnBlur();
   focus_ring_->SetVisible(false);
 }
 
 void MdTextButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   LabelButton::OnNativeThemeChanged(theme);
-  UpdateColorsFromNativeTheme();
+  UpdateColors();
 }
 
 SkColor MdTextButton::GetInkDropBaseColor() const {
   return color_utils::DeriveDefaultIconColor(label()->enabled_color());
 }
 
 std::unique_ptr<views::InkDropHighlight> MdTextButton::CreateInkDropHighlight()
     const {
   if (!ShouldShowInkDropHighlight())
     return nullptr;
@@ skipping 13 matching lines @@
       GetLocalBounds().CenterPoint(),
       base::WrapUnique(new BorderShadowLayerDelegate(
           shadows, GetLocalBounds(), kInkDropSmallCornerRadius))));
 }
 
 bool MdTextButton::ShouldShowInkDropForFocus() const {
   // These types of button use |focus_ring_|.
   return false;
 }
 
+void MdTextButton::SetEnabledTextColors(SkColor color) {
+  LabelButton::SetEnabledTextColors(color);
+  UpdateColors();
+}
+
 void MdTextButton::UpdateStyleToIndicateDefaultStatus() {
-  UpdateColorsFromNativeTheme();
+  UpdateColors();
 }
 
 MdTextButton::MdTextButton(ButtonListener* listener)
     : LabelButton(listener, base::string16()),
       focus_ring_(new internal::MdFocusRing()),
       is_cta_(false) {
   SetHasInkDrop(true);
   set_has_ink_drop_action_on_click(true);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   SetFocusForPlatform();
@@ skipping 21 matching lines @@
 
   // TODO(estade): can we get rid of the platform style border hoopla if
   // we apply the MD treatment to all buttons, even GTK buttons?
   SetBorder(Border::CreateEmptyBorder(
       top_padding - inbuilt_top_padding, kHorizontalPadding,
       bottom_padding - inbuilt_bottom_padding, kHorizontalPadding));
 }
 
 MdTextButton::~MdTextButton() {}
 
-void MdTextButton::UpdateColorsFromNativeTheme() {
+void MdTextButton::UpdateColors() {
   ui::NativeTheme::ColorId fg_color_id =
       is_cta_ ? ui::NativeTheme::kColorId_TextOnCallToActionColor
               : ui::NativeTheme::kColorId_ButtonEnabledColor;
 
   // When there's no call to action, respect a color override if one has
   // been set. For call to action styling, don't let individual buttons
   // specify a color.
   ui::NativeTheme* theme = GetNativeTheme();
   if (is_cta_ || !explicitly_set_normal_color())
-    SetEnabledTextColors(theme->GetSystemColor(fg_color_id));
+    LabelButton::SetEnabledTextColors(theme->GetSystemColor(fg_color_id));
 
   SkColor text_color = label()->enabled_color();
   SkColor bg_color =
       is_cta_
           ? theme->GetSystemColor(ui::NativeTheme::kColorId_CallToActionColor)
           : is_default()
                 ? color_utils::BlendTowardOppositeLuma(text_color, 0xD8)
                 : SK_ColorTRANSPARENT;
-  SkColor stroke_color = SkColorSetA(SK_ColorBLACK, 0x1A);
+
+  const SkAlpha kStrokeOpacity = 0x1A;
+  SkColor stroke_color = (is_cta_ || color_utils::IsDark(text_color))
+                             ? SkColorSetA(SK_ColorBLACK, kStrokeOpacity)
+                             : SkColorSetA(SK_ColorWHITE, 2 * kStrokeOpacity);
+
   set_background(Background::CreateBackgroundPainter(
       true, Painter::CreateRoundRectWith1PxBorderPainter(
                 bg_color, stroke_color, kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views