Index: ui/views/controls/combobox/combobox.cc |
diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc |
index 3de636fbdc15b1add675be3c316968e7afca2c1f..5215c7c800c50a229b9d8c2c061bae7c97788ccc 100644 |
--- a/ui/views/controls/combobox/combobox.cc |
+++ b/ui/views/controls/combobox/combobox.cc |
@@ -95,6 +95,8 @@ class TransparentButton : public CustomButton { |
TransparentButton(ButtonListener* listener) |
: CustomButton(listener) { |
SetAnimationDuration(LabelButton::kHoverAnimationDurationMs); |
+ SetFocusable(false); |
+ SetAccessibilityFocusable(false); |
} |
~TransparentButton() override {} |
@@ -353,7 +355,7 @@ Combobox::Combobox(ui::ComboboxModel* model) |
arrow_button_(new TransparentButton(this)), |
weak_ptr_factory_(this) { |
ModelChanged(); |
- SetFocusable(true); |
+ PlatformStyle::ConfigureFocus(PlatformStyle::CONTROL::COMBOBOX, this); |
UpdateBorder(); |
// set_background() takes ownership but takes a raw pointer. |
scoped_ptr<Background> b = PlatformStyle::CreateComboboxBackground(); |
@@ -381,8 +383,6 @@ Combobox::Combobox(ui::ComboboxModel* model) |
text_button_->SetVisible(true); |
arrow_button_->SetVisible(true); |
- text_button_->SetFocusable(false); |
- arrow_button_->SetFocusable(false); |
AddChildView(text_button_); |
AddChildView(arrow_button_); |
} |