| Index: ui/aura/demo/demo_main.cc
|
| diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc
|
| index 0571759829211eae39485cabf7f081c39f990f0f..e0112d19eeef5295af31fc9ab001d026bee848a5 100644
|
| --- a/ui/aura/demo/demo_main.cc
|
| +++ b/ui/aura/demo/demo_main.cc
|
| @@ -62,9 +62,9 @@ class DemoWindowDelegate : public aura::WindowDelegate {
|
| virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| return ui::TOUCH_STATUS_END;
|
| }
|
| - virtual ui::GestureStatus OnGestureEvent(
|
| + virtual ui::EventResult OnGestureEvent(
|
| ui::GestureEvent* event) OVERRIDE {
|
| - return ui::GESTURE_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
| virtual bool CanFocus() OVERRIDE { return true; }
|
| virtual void OnCaptureLost() OVERRIDE {}
|
|
|