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

Unified Diff: ash/keyboard_overlay/keyboard_overlay_view.h

Issue 10825026: Make accelerators not to work when the keyboard overlay is shown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months 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.h
diff --git a/ash/keyboard_overlay/keyboard_overlay_view.h b/ash/keyboard_overlay/keyboard_overlay_view.h
index a0b44e06eae98f60757f1d33f00071183fa0ccdf..c78944ad40cb6fbb90fda29ca1254805c56075c1 100644
--- a/ash/keyboard_overlay/keyboard_overlay_view.h
+++ b/ash/keyboard_overlay/keyboard_overlay_view.h
@@ -6,6 +6,7 @@
#define ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
#include "ash/ash_export.h"
+#include "ash/wm/overlay_event_filter.h"
#include "base/compiler_specific.h"
#include "ui/views/controls/webview/web_dialog_view.h"
@@ -20,13 +21,20 @@ class WebDialogDelegate;
}
// A customized dialog view for the keyboard overlay.
-class ASH_EXPORT KeyboardOverlayView : public views::WebDialogView {
+class ASH_EXPORT KeyboardOverlayView
+ : public views::WebDialogView,
+ public ash::internal::OverlayEventFilter::Delegate {
public:
KeyboardOverlayView(content::BrowserContext* context,
ui::WebDialogDelegate* delegate,
WebContentsHandler* handler);
virtual ~KeyboardOverlayView();
+ // Overridden from ash::internal::OverlayEventFilter::Delegate:
+ virtual void Cancel() OVERRIDE;
+ virtual bool IsCancelKeyEvent(aura::KeyEvent* event) OVERRIDE;
+ virtual aura::Window* GetWindow() OVERRIDE;
+
// Shows the keyboard overlay.
static void ShowDialog(content::BrowserContext* context,
WebContentsHandler* handler,

Powered by Google App Engine
This is Rietveld 408576698