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

Unified Diff: ash/keyboard_overlay/keyboard_overlay_view.h

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
« no previous file with comments | « ash/ash.gyp ('k') | ash/keyboard_overlay/keyboard_overlay_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/keyboard_overlay/keyboard_overlay_view.h
diff --git a/ash/keyboard_overlay/keyboard_overlay_view.h b/ash/keyboard_overlay/keyboard_overlay_view.h
index d83cb13309078818c6dfc7269b70db42f8a07f30..3e352ae31693ee31d78a4c344d700910573f0607 100644
--- a/ash/keyboard_overlay/keyboard_overlay_view.h
+++ b/ash/keyboard_overlay/keyboard_overlay_view.h
@@ -5,9 +5,12 @@
#ifndef ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
#define ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
+#include <vector>
+
#include "ash/ash_export.h"
#include "ash/wm/overlay_event_filter.h"
#include "base/compiler_specific.h"
+#include "base/gtest_prod_util.h"
#include "ui/views/controls/webview/web_dialog_view.h"
class GURL;
@@ -27,6 +30,11 @@ class ASH_EXPORT KeyboardOverlayView
: public views::WebDialogView,
public ash::internal::OverlayEventFilter::Delegate {
public:
+ struct KeyEventData {
+ ui::KeyboardCode key_code;
+ int flags;
+ };
+
KeyboardOverlayView(content::BrowserContext* context,
ui::WebDialogDelegate* delegate,
WebContentsHandler* handler);
@@ -43,9 +51,15 @@ class ASH_EXPORT KeyboardOverlayView
const GURL& url);
private:
+ FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayViewTest, OpenAcceleratorsClose);
+ FRIEND_TEST_ALL_PREFIXES(KeyboardOverlayViewTest, NoRedundantCancelingKeys);
+
// Overridden from views::WidgetDelegate:
virtual void WindowClosing() OVERRIDE;
+ static void GetCancelingKeysForTesting(
+ std::vector<KeyEventData>* canceling_keys);
+
DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayView);
};
« no previous file with comments | « ash/ash.gyp ('k') | ash/keyboard_overlay/keyboard_overlay_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698