| Index: ui/aura/root_window_unittest.cc
|
| diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
|
| index 5a6739ae3f0d37f9291ef7a1caf14f0f6e1b3db7..e76c787c36c365f4eb5d3f25e351912935181679 100644
|
| --- a/ui/aura/root_window_unittest.cc
|
| +++ b/ui/aura/root_window_unittest.cc
|
| @@ -451,14 +451,12 @@ class EventFilterRecorder : public ui::EventHandler {
|
| return ui::ER_UNHANDLED;
|
| }
|
|
|
| - virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE {
|
| + virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE {
|
| events_.push_back(event->type());
|
| - return ui::ER_UNHANDLED;
|
| }
|
|
|
| - virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| + virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| events_.push_back(event->type());
|
| - return ui::ER_UNHANDLED;
|
| }
|
|
|
| virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
|
|
|