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 3dfc48d6d4519dac0e81db37fc5c65870134c383..0c48aaf1139b8c1fd5f4d569a14f87cc93fa2336 100644 |
--- a/ui/views/controls/button/custom_button.cc |
+++ b/ui/views/controls/button/custom_button.cc |
@@ -282,6 +282,13 @@ bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) { |
return true; |
} |
+bool CustomButton::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { |
+ // If this button is focused and the user presses space or enter, don't let |
+ // that be treated as an accelerator. |
+ return (event.key_code() == ui::VKEY_SPACE) || |
+ (event.key_code() == ui::VKEY_RETURN); |
+} |
+ |
void CustomButton::ShowContextMenu(const gfx::Point& p, |
ui::MenuSourceType source_type) { |
if (!context_menu_controller()) |