diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 18:05:25 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 18:05:25 +0000 |
| commit | ca70609833412dd0cdc758724a92681474d62ee2 (patch) | |
| tree | 3f101230764f644cd1c0a2b7cb52aa556991aa82 /ash/keyboard_overlay | |
| parent | cb3221b804cdad65aaade7faff1f612644dee4a3 (diff) | |
| download | chromium_src-ca70609833412dd0cdc758724a92681474d62ee2.zip chromium_src-ca70609833412dd0cdc758724a92681474d62ee2.tar.gz chromium_src-ca70609833412dd0cdc758724a92681474d62ee2.tar.bz2 | |
Convert Aura to use ui::Event.
http://crbug.com/125937
TEST=existing
Review URL: https://chromiumcodereview.appspot.com/10827145
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/keyboard_overlay')
| -rw-r--r-- | ash/keyboard_overlay/keyboard_overlay_view.cc | 3 | ||||
| -rw-r--r-- | ash/keyboard_overlay/keyboard_overlay_view.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ash/keyboard_overlay/keyboard_overlay_view.cc b/ash/keyboard_overlay/keyboard_overlay_view.cc index 1831dcb..6545c0e 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view.cc +++ b/ash/keyboard_overlay/keyboard_overlay_view.cc @@ -9,6 +9,7 @@ #include "base/utf_string_conversions.h" #include "content/public/browser/browser_context.h" #include "grit/ash_strings.h" +#include "ui/base/event.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" @@ -47,7 +48,7 @@ void KeyboardOverlayView::Cancel() { widget->Close(); } -bool KeyboardOverlayView::IsCancelingKeyEvent(aura::KeyEvent* event) { +bool KeyboardOverlayView::IsCancelingKeyEvent(ui::KeyEvent* event) { if (event->type() != ui::ET_KEY_PRESSED) return false; for (size_t i = 0; i < arraysize(kCancelKeys); ++i) { diff --git a/ash/keyboard_overlay/keyboard_overlay_view.h b/ash/keyboard_overlay/keyboard_overlay_view.h index fc9fe89..0409d8b 100644 --- a/ash/keyboard_overlay/keyboard_overlay_view.h +++ b/ash/keyboard_overlay/keyboard_overlay_view.h @@ -32,7 +32,7 @@ class ASH_EXPORT KeyboardOverlayView // Overridden from ash::internal::OverlayEventFilter::Delegate: virtual void Cancel() OVERRIDE; - virtual bool IsCancelingKeyEvent(aura::KeyEvent* event) OVERRIDE; + virtual bool IsCancelingKeyEvent(ui::KeyEvent* event) OVERRIDE; virtual aura::Window* GetWindow() OVERRIDE; // Shows the keyboard overlay. |