diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-04 05:14:40 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-04 05:14:40 +0000 |
| commit | 3049477e7bf3d8b043fa8910ecb54506859c559f (patch) | |
| tree | 21fccc92ab3afa8c821edb53783d0dd28a8dec3b /ash/magnifier | |
| parent | 887c426e90a71ba51e80ffec8c30fcf1783c7c83 (diff) | |
| download | chromium_src-3049477e7bf3d8b043fa8910ecb54506859c559f.zip chromium_src-3049477e7bf3d8b043fa8910ecb54506859c559f.tar.gz chromium_src-3049477e7bf3d8b043fa8910ecb54506859c559f.tar.bz2 | |
ui: Remove TouchStatus in favour of EventResult.
BUG=none
Review URL: https://codereview.chromium.org/11364062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 2bcabbf..811de5b 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -121,7 +121,7 @@ class MagnificationControllerImpl : virtual public MagnificationController, ui::KeyEvent* event) OVERRIDE; virtual bool PreHandleMouseEvent(aura::Window* target, ui::MouseEvent* event) OVERRIDE; - virtual ui::TouchStatus PreHandleTouchEvent( + virtual ui::EventResult PreHandleTouchEvent( aura::Window* target, ui::TouchEvent* event) OVERRIDE; virtual ui::EventResult PreHandleGestureEvent( @@ -488,10 +488,10 @@ bool MagnificationControllerImpl::PreHandleMouseEvent(aura::Window* target, return false; } -ui::TouchStatus MagnificationControllerImpl::PreHandleTouchEvent( +ui::EventResult MagnificationControllerImpl::PreHandleTouchEvent( aura::Window* target, ui::TouchEvent* event) { - return ui::TOUCH_STATUS_UNKNOWN; + return ui::ER_UNHANDLED; } ui::EventResult MagnificationControllerImpl::PreHandleGestureEvent( |