| 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 463c282d7867a0270ec085dd393e3a5e76ba01f8..9dcd3f2794467d0735395f27b1b405f2a727c868 100644
|
| --- a/ash/wm/gestures/shelf_gesture_handler.cc
|
| +++ b/ash/wm/gestures/shelf_gesture_handler.cc
|
| @@ -12,7 +12,7 @@
|
| #include "ash/shell.h"
|
| #include "ash/system/status_area_widget.h"
|
| #include "ash/wm/gestures/tray_gesture_handler.h"
|
| -#include "ash/wm/window_properties.h"
|
| +#include "ash/wm/window_state.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/compositor/layer.h"
|
| @@ -43,11 +43,11 @@ bool ShelfGestureHandler::ProcessGestureEvent(const ui::GestureEvent& event) {
|
|
|
| ShelfLayoutManager* shelf = controller->GetShelfLayoutManager();
|
|
|
| - // The gesture are disabled for fullscreen windows that are not in immersive
|
| - // mode.
|
| const aura::Window* fullscreen = controller->GetTopmostFullscreenWindow();
|
| - if (fullscreen && !shelf->FullscreenWithMinimalChrome())
|
| + if (fullscreen &&
|
| + ash::wm::GetWindowState(fullscreen)->hide_shelf_when_fullscreen()) {
|
| return false;
|
| + }
|
|
|
| if (event.type() == ui::ET_GESTURE_SCROLL_BEGIN) {
|
| drag_in_progress_ = true;
|
|
|