| Index: trunk/src/ash/wm/stacking_controller.cc
|
| ===================================================================
|
| --- trunk/src/ash/wm/stacking_controller.cc (revision 194588)
|
| +++ trunk/src/ash/wm/stacking_controller.cc (working copy)
|
| @@ -5,8 +5,8 @@
|
| #include "ash/wm/stacking_controller.h"
|
|
|
| #include "ash/display/display_controller.h"
|
| -#include "ash/session_state_delegate.h"
|
| #include "ash/shell.h"
|
| +#include "ash/shell_delegate.h"
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/wm/always_on_top_controller.h"
|
| #include "ash/wm/coordinate_conversion.h"
|
| @@ -119,9 +119,8 @@
|
|
|
| // If screen lock is not active and user session is active,
|
| // all modal windows are placed into the normal modal container.
|
| - if (!Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
|
| - Shell::GetInstance()->session_state_delegate()->
|
| - IsActiveUserSessionStarted()) {
|
| + if (!Shell::GetInstance()->delegate()->IsScreenLocked() &&
|
| + Shell::GetInstance()->delegate()->IsSessionStarted()) {
|
| return GetContainerById(root,
|
| internal::kShellWindowId_SystemModalContainer);
|
| }
|
|
|