| Index: ash/wm/gestures/shelf_gesture_handler.cc
|
| diff --git a/ash/wm/gestures/shelf_gesture_handler.cc b/ash/wm/gestures/shelf_gesture_handler.cc
|
| index 9ac8f93d0f40520d7f1798606b3d707253ed3fc2..4bf4a39b1968ee1cbe6bcc3cf2822eefb88d078f 100644
|
| --- a/ash/wm/gestures/shelf_gesture_handler.cc
|
| +++ b/ash/wm/gestures/shelf_gesture_handler.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "ash/wm/gestures/shelf_gesture_handler.h"
|
|
|
| +#include "ash/root_window_controller.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_delegate.h"
|
| #include "ash/system/status_area_widget.h"
|
| @@ -40,7 +41,8 @@ bool ShelfGestureHandler::ProcessGestureEvent(const ui::GestureEvent& event) {
|
| if (active && wm::IsWindowFullscreen(active))
|
| return false;
|
|
|
| - ShelfLayoutManager* shelf = shell->shelf();
|
| + // TODO(oshima): Find the root window controller from event's location.
|
| + ShelfLayoutManager* shelf = Shell::GetPrimaryRootWindowController()->shelf();
|
| if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) {
|
| drag_in_progress_ = true;
|
| shelf->StartGestureDrag(event);
|
|
|