Make VKEY_F14 and VKEY_HELP close keyboard overlay.

ash/keyboard_overlay/keyboard_overlay_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/keyboard_overlay/keyboard_overlay_view.h"
 
 #include "ash/keyboard_overlay/keyboard_overlay_delegate.h"
 #include "ash/shell.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "grit/ash_strings.h"
 #include "ui/base/events/event.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 
 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 },
 };
 
 }
 
 namespace ash {
 
 KeyboardOverlayView::KeyboardOverlayView(
     content::BrowserContext* context,
     WebDialogDelegate* delegate,
     WebContentsHandler* handler)
@@ skipping 37 matching lines @@
       new KeyboardOverlayView(context, delegate, handler);
   delegate->Show(view);
 
   Shell::GetInstance()->overlay_filter()->Activate(view);
 }
 
 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, document that it just appends to the existing vector.

[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