Index: ash/wm/activation_controller.h |
diff --git a/ash/wm/activation_controller.h b/ash/wm/activation_controller.h |
index 24bf05081d9c029d26406860ff7135c31c6d2605..23fe7379ecc420312304fd6d1f3e20f7db4c37b4 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. |