| Index: ui/views/controls/combobox/combobox.cc
|
| diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
|
| index 2c26c8fb313d7bbf6713667246dcc26e5741442b..b3212d048e4d1042d7040b50b518e389d52e2730 100644
|
| --- a/ui/views/controls/combobox/combobox.cc
|
| +++ b/ui/views/controls/combobox/combobox.cc
|
| @@ -507,6 +507,11 @@ void Combobox::SetInvalid(bool invalid) {
|
|
|
| invalid_ = invalid;
|
|
|
| + if (HasFocus() && UseMd()) {
|
| + FocusRing::Install(this, invalid_
|
| + ? ui::NativeTheme::kColorId_AlertSeverityHigh
|
| + : ui::NativeTheme::kColorId_NumColors);
|
| + }
|
| UpdateBorder();
|
| SchedulePaint();
|
| }
|
| @@ -710,8 +715,11 @@ void Combobox::OnFocus() {
|
| View::OnFocus();
|
| // Border renders differently when focused.
|
| SchedulePaint();
|
| - if (UseMd())
|
| - FocusRing::Install(this);
|
| + if (UseMd()) {
|
| + FocusRing::Install(this, invalid_
|
| + ? ui::NativeTheme::kColorId_AlertSeverityHigh
|
| + : ui::NativeTheme::kColorId_NumColors);
|
| + }
|
| }
|
|
|
| void Combobox::OnBlur() {
|
| @@ -765,7 +773,7 @@ void Combobox::UpdateBorder() {
|
| if (style_ == STYLE_ACTION)
|
| border->SetInsets(5, 10, 5, 10);
|
| if (invalid_)
|
| - border->SetColor(gfx::kGoogleRed700);
|
| + border->SetColorId(ui::NativeTheme::kColorId_AlertSeverityHigh);
|
| SetBorder(std::move(border));
|
| }
|
|
|
|
|