| Index: ash/accelerators/accelerator_filter.h
|
| ===================================================================
|
| --- ash/accelerators/accelerator_filter.h (revision 150582)
|
| +++ ash/accelerators/accelerator_filter.h (working copy)
|
| @@ -22,14 +22,15 @@
|
|
|
| // Overridden from aura::EventFilter:
|
| virtual bool PreHandleKeyEvent(aura::Window* target,
|
| - aura::KeyEvent* event) OVERRIDE;
|
| + ui::KeyEvent* event) OVERRIDE;
|
| virtual bool PreHandleMouseEvent(aura::Window* target,
|
| - aura::MouseEvent* event) OVERRIDE;
|
| - virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
|
| - aura::TouchEvent* event) OVERRIDE;
|
| + ui::MouseEvent* event) OVERRIDE;
|
| + virtual ui::TouchStatus PreHandleTouchEvent(
|
| + aura::Window* target,
|
| + ui::TouchEventImpl* event) OVERRIDE;
|
| virtual ui::GestureStatus PreHandleGestureEvent(
|
| aura::Window* target,
|
| - aura::GestureEvent* event) OVERRIDE;
|
| + ui::GestureEventImpl* event) OVERRIDE;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(AcceleratorFilter);
|
|
|