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..056a83764473bc248edb80a6f0b7b5d9482404ed 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 (GetWidget() && !GetWidget()->IsActive()) |
sky
2015/11/11 18:54:01
Actually, how is the button getting the accelerato
meacer
2015/11/12 00:37:32
One of the failing tests has this scenario: Constr
|
+ return false; |
SetState(STATE_NORMAL); |
// TODO(beng): remove once NotifyClick takes ui::Event. |
ui::MouseEvent synthetic_event( |