From 3049477e7bf3d8b043fa8910ecb54506859c559f Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Sun, 4 Nov 2012 05:14:40 +0000 Subject: 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 --- ash/magnifier/magnification_controller.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ash/magnifier') 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( -- cgit v1.1