Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: ash/keyboard_overlay/keyboard_overlay_view.cc

Issue 11636037: Make VKEY_F14 and VKEY_HELP close keyboard overlay. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address a comment Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..82c80916f0d1510f90398de5a5bf5659bde38e2f 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,13 @@ void KeyboardOverlayView::WindowClosing() {
Cancel();
}
+// static
+void KeyboardOverlayView::GetCancelingKeysForTesting(
+ std::vector<KeyboardOverlayView::KeyEventData>* canceling_keys) {
+ CHECK(canceling_keys);
+ canceling_keys->clear();
+ for (size_t i = 0; i < arraysize(kCancelKeys); ++i)
+ canceling_keys->push_back(kCancelKeys[i]);
+}
+
} // namespace ash
« no previous file with comments | « ash/keyboard_overlay/keyboard_overlay_view.h ('k') | ash/keyboard_overlay/keyboard_overlay_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698