| Index: ash/magnifier/magnification_controller.cc
|
| diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
|
| index cf028cd67d6f42fd9346fc8d9c3ab7ead94c50e8..af31704cf23264ce275d459a115c2d2c72e72ab3 100644
|
| --- a/ash/magnifier/magnification_controller.cc
|
| +++ b/ash/magnifier/magnification_controller.cc
|
| @@ -105,7 +105,7 @@ class MagnificationControllerImpl : virtual public MagnificationController,
|
| virtual ui::TouchStatus PreHandleTouchEvent(
|
| aura::Window* target,
|
| ui::TouchEvent* event) OVERRIDE;
|
| - virtual ui::GestureStatus PreHandleGestureEvent(
|
| + virtual ui::EventResult PreHandleGestureEvent(
|
| aura::Window* target,
|
| ui::GestureEvent* event) OVERRIDE;
|
|
|
| @@ -452,10 +452,10 @@ ui::TouchStatus MagnificationControllerImpl::PreHandleTouchEvent(
|
| return ui::TOUCH_STATUS_UNKNOWN;
|
| }
|
|
|
| -ui::GestureStatus MagnificationControllerImpl::PreHandleGestureEvent(
|
| +ui::EventResult MagnificationControllerImpl::PreHandleGestureEvent(
|
| aura::Window* target,
|
| ui::GestureEvent* event) {
|
| - return ui::GESTURE_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|