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 a4e8737468c556e7a6128b384807c0545418353e..2fa79052b435f08162af21407f858ef94699a7a5 100644 |
--- a/ash/wm/gestures/shelf_gesture_handler.cc |
+++ b/ash/wm/gestures/shelf_gesture_handler.cc |
@@ -5,11 +5,11 @@ |
#include "ash/wm/gestures/shelf_gesture_handler.h" |
#include "ash/root_window_controller.h" |
+#include "ash/session_state_delegate.h" |
#include "ash/shelf/shelf_layout_manager.h" |
#include "ash/shelf/shelf_types.h" |
#include "ash/shelf/shelf_widget.h" |
#include "ash/shell.h" |
-#include "ash/shell_delegate.h" |
#include "ash/system/status_area_widget.h" |
#include "ash/wm/gestures/tray_gesture_handler.h" |
#include "ash/wm/window_util.h" |
@@ -31,8 +31,8 @@ ShelfGestureHandler::~ShelfGestureHandler() { |
bool ShelfGestureHandler::ProcessGestureEvent(const ui::GestureEvent& event) { |
Shell* shell = Shell::GetInstance(); |
- if (!shell->delegate()->IsUserLoggedIn() || |
- shell->delegate()->IsScreenLocked()) { |
+ if (!shell->session_state_delegate()->HasActiveUser() || |
+ shell->session_state_delegate()->IsScreenLocked()) { |
// The gestures are disabled in the lock/login screen. |
return false; |
} |