summaryrefslogtreecommitdiffstats
path: root/ash/wm/activation_controller.h
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/activation_controller.h')
-rw-r--r--ash/wm/activation_controller.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h
index 24bf0508..23fe737 100644
--- a/ash/wm/activation_controller.h
+++ b/ash/wm/activation_controller.h
@@ -77,8 +77,8 @@ class ASH_EXPORT ActivationController
// Overridden from ui::EventHandler:
virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
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 void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
+ virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
// Implementation of ActivateWindow() with an Event.