| Index: ui/views/controls/combobox/combobox.cc
|
| diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc
|
| index 3d7cfd1e26585dae22ab9fd8f8cfe5d876987304..dfed4eba477035292d17f61a5061b5b7930f9c7d 100644
|
| --- a/ui/views/controls/combobox/combobox.cc
|
| +++ b/ui/views/controls/combobox/combobox.cc
|
| @@ -110,13 +110,18 @@ class TransparentButton : public CustomButton {
|
| : CustomButton(listener) {
|
| SetAnimationDuration(LabelButton::kHoverAnimationDurationMs);
|
| SetFocusBehavior(FocusBehavior::NEVER);
|
| + set_notify_action(PlatformStyle::kMenuNotifyActivationAction);
|
| }
|
| ~TransparentButton() override {}
|
|
|
| +#if !defined(OS_MACOSX)
|
| + // Override OnMousePressed() to transfer focus to the parent() on a click
|
| + // except on Mac, which doesn't transfer focus when buttons are clicked.
|
| bool OnMousePressed(const ui::MouseEvent& mouse_event) override {
|
| parent()->RequestFocus();
|
| return true;
|
| }
|
| +#endif
|
|
|
| double GetAnimationValue() const {
|
| return hover_animation().GetCurrentValue();
|
|
|