Index: ash/keyboard_overlay/keyboard_overlay_view.cc |
diff --git a/ash/keyboard_overlay/keyboard_overlay_view.cc b/ash/keyboard_overlay/keyboard_overlay_view.cc |
index a52ace143c464142a9f975c569fe7a8b9d76e77b..ee70220f66240bf41f5cd217c9feeb3d7227e1ba 100644 |
--- a/ash/keyboard_overlay/keyboard_overlay_view.cc |
+++ b/ash/keyboard_overlay/keyboard_overlay_view.cc |
@@ -19,14 +19,13 @@ using ui::WebDialogDelegate; |
namespace { |
-// Keys to invoke Cancel (Escape, Ctrl+Alt+/, or Shift+Ctrl+Alt+/). |
-const struct KeyEventData { |
- ui::KeyboardCode key_code; |
- int flags; |
-} kCancelKeys[] = { |
+// Keys to invoke Cancel (Escape, Ctrl+Alt+/, or Shift+Ctrl+Alt+/, Help, F14). |
+const ash::KeyboardOverlayView::KeyEventData kCancelKeys[] = { |
{ ui::VKEY_ESCAPE, ui::EF_NONE}, |
{ ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN }, |
{ ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN }, |
+ { ui::VKEY_HELP, ui::EF_NONE }, |
+ { ui::VKEY_F14, ui::EF_NONE }, |
}; |
} |
@@ -84,4 +83,12 @@ void KeyboardOverlayView::WindowClosing() { |
Cancel(); |
} |
+// static |
+void KeyboardOverlayView::GetCancelingKeysForTesting( |
+ std::vector<KeyboardOverlayView::KeyEventData>* canceling_keys) { |
+ CHECK(canceling_keys); |
Daniel Erat
2012/12/20 04:55:25
nit: canceling_keys->clear() ?
otherwise, documen
mazda
2012/12/20 08:51:11
Added clear(). Thanks.
|
+ for (size_t i = 0; i < arraysize(kCancelKeys); ++i) |
+ canceling_keys->push_back(kCancelKeys[i]); |
+} |
+ |
} // namespace ash |