| Index: ash/wm/workspace/workspace_cycler.cc
|
| diff --git a/ash/wm/workspace/workspace_cycler.cc b/ash/wm/workspace/workspace_cycler.cc
|
| index 67319937b6c089718e10cf2bf1488e173ba60d14..9d4cda1b50e6f945b3496fe8b69323534f60a6c1 100644
|
| --- a/ash/wm/workspace/workspace_cycler.cc
|
| +++ b/ash/wm/workspace/workspace_cycler.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <cmath>
|
|
|
| +#include "ash/session_state_delegate.h"
|
| #include "ash/shell.h"
|
| #include "ash/wm/workspace/workspace_cycler_configuration.h"
|
| #include "ash/wm/workspace/workspace_manager.h"
|
| @@ -22,7 +23,7 @@ namespace {
|
| // Returns true if cycling is allowed.
|
| bool IsCyclingAllowed() {
|
| // Cycling is disabled if the screen is locked or a modal dialog is open.
|
| - return !Shell::GetInstance()->IsScreenLocked() &&
|
| + return !Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
|
| !Shell::GetInstance()->IsSystemModalWindowOpen();
|
| }
|
|
|
|
|