| Index: ash/accelerators/accelerator_filter.h
|
| diff --git a/ash/accelerators/accelerator_filter.h b/ash/accelerators/accelerator_filter.h
|
| index d8a0cb1af91d490892bf48346b0c4c0e536517bd..d8110b1accb2bb1dfc0dae7f11a035ae5be9d6d5 100644
|
| --- a/ash/accelerators/accelerator_filter.h
|
| +++ b/ash/accelerators/accelerator_filter.h
|
| @@ -25,7 +25,7 @@ class ASH_EXPORT AcceleratorFilter : 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(
|
|
|