| Index: ui/aura/demo/demo_main.cc
|
| diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
|
| index b3475ed9fe1df61a4999a34647e785dad7b3791f..6a6d43b5b6bd327efd65a03c2fa43eb04549841c 100644
|
| --- a/ui/aura/demo/demo_main.cc
|
| +++ b/ui/aura/demo/demo_main.cc
|
| @@ -77,8 +77,8 @@ class DemoWindowDelegate : public aura::WindowDelegate {
|
| virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
|
| return ui::ER_HANDLED;
|
| }
|
| - virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| - return ui::TOUCH_STATUS_END;
|
| + virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| + return ui::ER_UNHANDLED;
|
| }
|
| virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
|
| return ui::ER_UNHANDLED;
|
|
|