| Index: ui/views/corewm/focus_controller.h
|
| diff --git a/ui/views/corewm/focus_controller.h b/ui/views/corewm/focus_controller.h
|
| index df9b51e0c1d623dcb75ca3c179f89d01ad48585c..53b781d578aea5f1edf14d0960cb60b25664ec89 100644
|
| --- a/ui/views/corewm/focus_controller.h
|
| +++ b/ui/views/corewm/focus_controller.h
|
| @@ -73,8 +73,8 @@ class VIEWS_EXPORT FocusController : public aura::client::ActivationClient,
|
| // 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;
|
|
|
| // Overridden from aura::WindowObserver:
|
|
|