| Index: ash/wm/shelf_layout_manager.cc
|
| diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
|
| index e12b289abdb393072d56ac63d8247430c143164b..a447c16dafddba7515f41c33be4c29454c15bfa6 100644
|
| --- a/ash/wm/shelf_layout_manager.cc
|
| +++ b/ash/wm/shelf_layout_manager.cc
|
| @@ -63,7 +63,7 @@ class ShelfLayoutManager::AutoHideEventFilter : public aura::EventFilter {
|
| virtual ui::TouchStatus PreHandleTouchEvent(
|
| aura::Window* target,
|
| ui::TouchEvent* event) OVERRIDE;
|
| - virtual ui::GestureStatus PreHandleGestureEvent(
|
| + virtual ui::EventResult PreHandleGestureEvent(
|
| aura::Window* target,
|
| ui::GestureEvent* event) OVERRIDE;
|
|
|
| @@ -111,11 +111,11 @@ ui::TouchStatus ShelfLayoutManager::AutoHideEventFilter::PreHandleTouchEvent(
|
| return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
|
| }
|
|
|
| -ui::GestureStatus
|
| +ui::EventResult
|
| ShelfLayoutManager::AutoHideEventFilter::PreHandleGestureEvent(
|
| aura::Window* target,
|
| ui::GestureEvent* event) {
|
| - return ui::GESTURE_STATUS_UNKNOWN; // Not handled.
|
| + return ui::ER_UNHANDLED; // Not handled.
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|