| Index: ash/wm/window_modality_controller.h
|
| diff --git a/ash/wm/window_modality_controller.h b/ash/wm/window_modality_controller.h
|
| index 76fc6ddac0679b057b28bd6259f0c773fb33c831..9e6b5ebf859e4b7417d1c63d837d6ad55cb79bf3 100644
|
| --- a/ash/wm/window_modality_controller.h
|
| +++ b/ash/wm/window_modality_controller.h
|
| @@ -42,7 +42,7 @@ class WindowModalityController : public aura::EventFilter,
|
| 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(
|
|
|