Index: ui/views/controls/button/custom_button.cc |
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc |
index 61b595bbfeb2f059327527ad3c1ef18e76afb270..eaef00dcc992db1b28aba825adb38cd24e2a54c8 100644 |
--- a/ui/views/controls/button/custom_button.cc |
+++ b/ui/views/controls/button/custom_button.cc |
@@ -251,6 +251,8 @@ void CustomButton::OnGestureEvent(ui::GestureEvent* event) { |
} |
bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) { |
+ if (!HasFocus()) |
msw
2015/11/10 22:48:34
This isn't quite right... you want to check if !Ge
meacer
2015/11/11 00:32:59
Done.
|
+ return false; |
SetState(STATE_NORMAL); |
// TODO(beng): remove once NotifyClick takes ui::Event. |
ui::MouseEvent synthetic_event( |