| Index: trunk/src/ash/wm/gestures/shelf_gesture_handler.cc
|
| ===================================================================
|
| --- trunk/src/ash/wm/gestures/shelf_gesture_handler.cc (revision 194588)
|
| +++ trunk/src/ash/wm/gestures/shelf_gesture_handler.cc (working copy)
|
| @@ -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 @@
|
|
|
| bool ShelfGestureHandler::ProcessGestureEvent(const ui::GestureEvent& event) {
|
| Shell* shell = Shell::GetInstance();
|
| - if (!shell->session_state_delegate()->HasActiveUser() ||
|
| - shell->session_state_delegate()->IsScreenLocked()) {
|
| + if (!shell->delegate()->IsUserLoggedIn() ||
|
| + shell->delegate()->IsScreenLocked()) {
|
| // The gestures are disabled in the lock/login screen.
|
| return false;
|
| }
|
|
|