diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 17:16:21 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 17:16:21 +0000 |
| commit | 5eebaf46e7ea120921c3fcfce64ea45047659641 (patch) | |
| tree | 6afa9a413c557de459ee0ad4c997bd26404ebffe /ash/wm/window_manager_unittest.cc | |
| parent | 25cc762f00cbc1904e997f789078162e51e91418 (diff) | |
| download | chromium_src-5eebaf46e7ea120921c3fcfce64ea45047659641.zip chromium_src-5eebaf46e7ea120921c3fcfce64ea45047659641.tar.gz chromium_src-5eebaf46e7ea120921c3fcfce64ea45047659641.tar.bz2 | |
events: Update key-event handlers to not return EventResult.
BUG=163618
Review URL: https://codereview.chromium.org/11570012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/window_manager_unittest.cc')
| -rw-r--r-- | ash/wm/window_manager_unittest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc index 98568e4..773a4a6 100644 --- a/ash/wm/window_manager_unittest.cc +++ b/ash/wm/window_manager_unittest.cc @@ -54,9 +54,12 @@ class CustomEventHandler : public aura::test::TestEventHandler { } // Overridden from ui::EventHandler: - virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE { - ui::EventResult result = aura::test::TestEventHandler::OnKeyEvent(event); - return key_result_ == ui::ER_UNHANDLED ? result : key_result_; + virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE { + aura::test::TestEventHandler::OnKeyEvent(event); + if (key_result_ & ui::ER_HANDLED) + event->SetHandled(); + if (key_result_ & ui::ER_CONSUMED) + event->StopPropagation(); } virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE { |