| Index: ash/wm/activation_controller.h
|
| diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
|
| index 3b439abe4201a8c55a6578f4bf4164c4faa8a6b9..6af15ede3b77d9496b90045e654156ea31b58a03 100644
|
| --- a/ash/wm/activation_controller.h
|
| +++ b/ash/wm/activation_controller.h
|
| @@ -77,7 +77,7 @@ class ASH_EXPORT ActivationController
|
| virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
|
| virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
|
| virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
|
| - virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
|
|
| // Implementation of ActivateWindow() with an Event.
|
| void ActivateWindowWithEvent(aura::Window* window,
|
|
|