| Index: ui/aura/window_unittest.cc
|
| diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
|
| index 6289000c45b7f9fec71f05da90a3ac86f85c71fe..1aec91f6a708aef4a650e858d9ea47c9f930c021 100644
|
| --- a/ui/aura/window_unittest.cc
|
| +++ b/ui/aura/window_unittest.cc
|
| @@ -171,11 +171,10 @@ class CaptureWindowDelegateImpl : public TestWindowDelegate {
|
| int touch_event_count() const { return touch_event_count_; }
|
| int gesture_event_count() const { return gesture_event_count_; }
|
|
|
| - virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
| + virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
| if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED)
|
| capture_changed_event_count_++;
|
| mouse_event_count_++;
|
| - return ui::ER_UNHANDLED;
|
| }
|
| virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| touch_event_count_++;
|
| @@ -1072,7 +1071,7 @@ class MouseEnterExitWindowDelegate : public TestWindowDelegate {
|
| public:
|
| MouseEnterExitWindowDelegate() : entered_(false), exited_(false) {}
|
|
|
| - virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
| + virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
| switch (event->type()) {
|
| case ui::ET_MOUSE_ENTERED:
|
| entered_ = true;
|
| @@ -1083,7 +1082,6 @@ class MouseEnterExitWindowDelegate : public TestWindowDelegate {
|
| default:
|
| break;
|
| }
|
| - return ui::ER_UNHANDLED;
|
| }
|
|
|
| bool entered() const { return entered_; }
|
|
|