| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index aceb53403905c9d293c7da2011ef2c1c9f10a3f2..816933b25811f265f2fbdfcd9c7a3f8f0a88b28e 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -389,9 +389,10 @@ SystemModalContainerLayoutManager*
|
| RootWindowController::GetSystemModalLayoutManager(WmWindow* window) {
|
| WmWindow* modal_container = nullptr;
|
| if (window) {
|
| - WmWindow* window_container = wm::GetContainerForWindow(window);
|
| - if (window_container && window_container->aura_window()->id() >=
|
| - kShellWindowId_LockScreenContainer) {
|
| + aura::Window* window_container =
|
| + wm::GetContainerForWindow(window->aura_window());
|
| + if (window_container &&
|
| + window_container->id() >= kShellWindowId_LockScreenContainer) {
|
| modal_container = GetWmContainer(kShellWindowId_LockSystemModalContainer);
|
| } else {
|
| modal_container = GetWmContainer(kShellWindowId_SystemModalContainer);
|
|
|