Chromium Code Reviews| 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..9c5b6f61da07fd6ba516a6bed0fd70b8ebeb13de 100644 |
| --- a/ui/views/controls/combobox/combobox.cc |
| +++ b/ui/views/controls/combobox/combobox.cc |
| @@ -110,13 +110,17 @@ class TransparentButton : public CustomButton { |
| : CustomButton(listener) { |
| SetAnimationDuration(LabelButton::kHoverAnimationDurationMs); |
| SetFocusBehavior(FocusBehavior::NEVER); |
| + set_notify_action(PlatformStyle::kMenuActivationAction); |
| } |
| ~TransparentButton() override {} |
| +#if defined(OS_MACOSX) |
| bool OnMousePressed(const ui::MouseEvent& mouse_event) override { |
|
tapted
2016/06/23 00:54:29
nit: comment here like
// Override OnMousePresse
spqchan
2016/06/28 17:05:59
Added the comment in. I'm a bit confused with what
tapted
2016/06/29 12:02:55
Yes - it should stay (just not on Mac). Sorry - ha
|
| parent()->RequestFocus(); |
| + CustomButton::OnMousePressed(mouse_event); |
| return true; |
| } |
| +#endif |
| double GetAnimationValue() const { |
| return hover_animation().GetCurrentValue(); |