| Index: ui/aura/test/test_window_delegate.h
|
| ===================================================================
|
| --- ui/aura/test/test_window_delegate.h (revision 150582)
|
| +++ ui/aura/test/test_window_delegate.h (working copy)
|
| @@ -31,15 +31,16 @@
|
| const gfx::Rect& new_bounds) OVERRIDE;
|
| virtual void OnFocus(Window* old_focused_window) OVERRIDE;
|
| virtual void OnBlur() OVERRIDE;
|
| - virtual bool OnKeyEvent(KeyEvent* event) OVERRIDE;
|
| + virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
|
| virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
|
| virtual bool ShouldDescendIntoChildForEventHandling(
|
| Window* child,
|
| const gfx::Point& location) OVERRIDE;
|
| - virtual bool OnMouseEvent(MouseEvent* event) OVERRIDE;
|
| - virtual ui::TouchStatus OnTouchEvent(TouchEvent* event) OVERRIDE;
|
| - virtual ui::GestureStatus OnGestureEvent(GestureEvent* event) OVERRIDE;
|
| + virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
| + virtual ui::TouchStatus OnTouchEvent(ui::TouchEventImpl* event) OVERRIDE;
|
| + virtual ui::GestureStatus OnGestureEvent(
|
| + ui::GestureEventImpl* event) OVERRIDE;
|
| virtual bool CanFocus() OVERRIDE;
|
| virtual void OnCaptureLost() OVERRIDE;
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| @@ -66,7 +67,7 @@
|
| ui::KeyboardCode last_key_code() const { return last_key_code_; }
|
|
|
| // Overridden from TestWindowDelegate:
|
| - virtual bool OnKeyEvent(KeyEvent* event) OVERRIDE;
|
| + virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| virtual void OnWindowDestroyed() OVERRIDE;
|
| virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
|
|
| @@ -98,8 +99,8 @@
|
| EventCountDelegate();
|
|
|
| // Overridden from TestWindowDelegate:
|
| - virtual bool OnMouseEvent(MouseEvent* event) OVERRIDE;
|
| - virtual bool OnKeyEvent(KeyEvent* event) OVERRIDE;
|
| + virtual bool OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
| + virtual bool OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
|
|
| // Returns the counts of mouse motion events in the
|
| // form of "<enter> <move> <leave>".
|
|
|