| Index: ash/wm/overview/window_selector_controller.cc
|
| diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc
|
| index 73b9c148146c1129afb2de9ddd2c4f98de5ff4cc..19e5005877563523d79cb50112c561692922424a 100644
|
| --- a/ash/wm/overview/window_selector_controller.cc
|
| +++ b/ash/wm/overview/window_selector_controller.cc
|
| @@ -30,9 +30,12 @@ WindowSelectorController::~WindowSelectorController() {
|
| bool WindowSelectorController::CanSelect() {
|
| // Don't allow a window overview if the screen is locked or a modal dialog is
|
| // open or running in kiosk app session.
|
| - return Shell::GetInstance()->session_state_delegate()->
|
| - IsActiveUserSessionStarted() &&
|
| + return Shell::GetInstance()
|
| + ->session_state_delegate()
|
| + ->IsActiveUserSessionStarted() &&
|
| !Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
|
| + Shell::GetInstance()->session_state_delegate()->GetSessionState() ==
|
| + SessionStateDelegate::SESSION_STATE_ACTIVE &&
|
| !Shell::GetInstance()->IsSystemModalWindowOpen() &&
|
| Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus() !=
|
| user::LOGGED_IN_KIOSK_APP;
|
|
|