| Index: ui/views/controls/focusable_border.cc
|
| diff --git a/ui/views/controls/focusable_border.cc b/ui/views/controls/focusable_border.cc
|
| index ee4005756d273f7400db24db20eea8d7f7767188..2d500a90f9f133f6afca0c239ec1f901b8ec56d7 100644
|
| --- a/ui/views/controls/focusable_border.cc
|
| +++ b/ui/views/controls/focusable_border.cc
|
| @@ -85,11 +85,16 @@ void FocusableBorder::SetInsets(int top, int left, int bottom, int right) {
|
| SkColor FocusableBorder::GetCurrentColor(const View& view) const {
|
| if (!use_default_color_)
|
| return override_color_;
|
| +
|
| SkColor color = view.GetNativeTheme()->GetSystemColor(
|
| view.HasFocus() ? ui::NativeTheme::kColorId_FocusedBorderColor :
|
| ui::NativeTheme::kColorId_UnfocusedBorderColor);
|
| - if (ui::MaterialDesignController::IsSecondaryUiMaterial() && !view.enabled())
|
| - color = color_utils::BlendTowardOppositeLuma(color, 0x61);
|
| + if (ui::MaterialDesignController::IsSecondaryUiMaterial() &&
|
| + !view.enabled()) {
|
| + return color_utils::BlendTowardOppositeLuma(color,
|
| + gfx::kDisabledControlAlpha);
|
| + }
|
| +
|
| return color;
|
| }
|
|
|
|
|