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

Side by Side 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: address comments 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/ash.gyp ('k') | ash/keyboard_overlay/keyboard_overlay_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_ 5 #ifndef ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
6 #define ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_ 6 #define ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/wm/overlay_event_filter.h"
9 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
10 #include "ui/views/controls/webview/web_dialog_view.h" 11 #include "ui/views/controls/webview/web_dialog_view.h"
11 12
12 class GURL; 13 class GURL;
13 14
14 namespace content { 15 namespace content {
15 class BrowserContext; 16 class BrowserContext;
16 } 17 }
17 18
18 namespace ui { 19 namespace ui {
19 class WebDialogDelegate; 20 class WebDialogDelegate;
20 } 21 }
21 22
22 // A customized dialog view for the keyboard overlay. 23 // A customized dialog view for the keyboard overlay.
23 class ASH_EXPORT KeyboardOverlayView : public views::WebDialogView { 24 class ASH_EXPORT KeyboardOverlayView
25 : public views::WebDialogView,
26 public ash::internal::OverlayEventFilter::Delegate {
24 public: 27 public:
25 KeyboardOverlayView(content::BrowserContext* context, 28 KeyboardOverlayView(content::BrowserContext* context,
26 ui::WebDialogDelegate* delegate, 29 ui::WebDialogDelegate* delegate,
27 WebContentsHandler* handler); 30 WebContentsHandler* handler);
28 virtual ~KeyboardOverlayView(); 31 virtual ~KeyboardOverlayView();
29 32
33 // Overridden from ash::internal::OverlayEventFilter::Delegate:
34 virtual void Cancel() OVERRIDE;
35 virtual bool IsCancelingKeyEvent(aura::KeyEvent* event) OVERRIDE;
36 virtual aura::Window* GetWindow() OVERRIDE;
37
30 // Shows the keyboard overlay. 38 // Shows the keyboard overlay.
31 static void ShowDialog(content::BrowserContext* context, 39 static void ShowDialog(content::BrowserContext* context,
32 WebContentsHandler* handler, 40 WebContentsHandler* handler,
33 const GURL& url); 41 const GURL& url);
34 42
35 private: 43 private:
36 // Overridden from views::WidgetDelegate: 44 // Overridden from views::WidgetDelegate:
37 virtual void WindowClosing() OVERRIDE; 45 virtual void WindowClosing() OVERRIDE;
38 46
39 DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayView); 47 DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayView);
40 }; 48 };
41 49
42 #endif // ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_ 50 #endif // ASH_KEYBOARD_OVERLAY_KEYBOARD_OVERLAY_VIEW_H_
OLDNEW
« 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