views: use darker stroke for non-prominent buttons

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_palette.h"
@@ skipping 232 matching lines @@
 
   ui::NativeTheme* theme = GetNativeTheme();
   if (!explicitly_set_normal_color())
     LabelButton::SetEnabledTextColors(theme->GetSystemColor(fg_color_id));
 
   // Prominent buttons keep their enabled text color; disabled state is conveyed
   // by shading the background instead.
   if (is_prominent_)
     SetTextColor(STATE_DISABLED, theme->GetSystemColor(fg_color_id));
 
-  SkColor text_color = label()->enabled_color();
   SkColor bg_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
 
   if (bg_color_override_) {
     bg_color = *bg_color_override_;
   } else if (is_prominent_) {
     bg_color = theme->GetSystemColor(
         ui::NativeTheme::kColorId_ProminentButtonColor);
     if (state() == STATE_DISABLED)
       bg_color = color_utils::BlendTowardOppositeLuma(
           bg_color, gfx::kDisabledControlAlpha);
   }
 
   if (state() == STATE_PRESSED) {
     SkColor shade =
         theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonPressedShade);
     bg_color = color_utils::GetResultingPaintColor(shade, bg_color);
   }
 
-  SkColor stroke_color =
-      is_prominent_ ? SK_ColorTRANSPARENT : SkColorSetA(text_color, 0x33);
+  SkColor stroke_color = theme->GetSystemColor(
+      is_prominent_ ? ui::NativeTheme::kColorId_ProminentButtonBorderColor
+                    : ui::NativeTheme::kColorId_NonProminentButtonBorderColor);

[Evan Stade, 2016/10/10 17:13:49]

this doesn't work well for buttons that use custom colors (like the Show All
button on the DL shelf).

I think we are supposed to be using kPrimaryTextColor for
kColorId_ButtonEnabledColor in common_theme.cc. That should fix both the text
color and the stroke.

   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   set_background(Background::CreateBackgroundPainter(
       true, Painter::CreateRoundRectWith1PxBorderPainter(
                 bg_color, stroke_color, kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views