| Index: ash/common/wm/workspace/workspace_layout_manager.cc
|
| diff --git a/ash/common/wm/workspace/workspace_layout_manager.cc b/ash/common/wm/workspace/workspace_layout_manager.cc
|
| index ddef2f202e6be06448958c6efddb6dbe1b56e6e2..8ff93626eeff58878745496ea231b1daa6f6c212 100644
|
| --- a/ash/common/wm/workspace/workspace_layout_manager.cc
|
| +++ b/ash/common/wm/workspace/workspace_layout_manager.cc
|
| @@ -7,7 +7,7 @@
|
| #include <algorithm>
|
|
|
| #include "ash/common/keyboard/keyboard_observer_register.h"
|
| -#include "ash/common/session/session_state_delegate.h"
|
| +#include "ash/common/session/session_controller.h"
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/wm/always_on_top_controller.h"
|
| #include "ash/common/wm/fullscreen_window_finder.h"
|
| @@ -352,7 +352,7 @@ void WorkspaceLayoutManager::AdjustAllWindowsBoundsForWorkAreaChange(
|
| // This would happen if the launcher was auto hidden before the login screen
|
| // was shown and then gets shown when the login screen gets presented.
|
| if (event->type() == wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED &&
|
| - shell_->GetSessionStateDelegate()->IsScreenLocked())
|
| + WmShell::Get()->session_controller()->IsScreenLocked())
|
| return;
|
|
|
| // If a user plugs an external display into a laptop running Aura the
|
|
|