Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
index d7fe65fe2f9b9124db9f979479330930bcaa10f8..6d269e05b4682948b28dca715d29786db8c6b685 100644 |
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
@@ -7,11 +7,10 @@ |
#include <utility> |
#include <vector> |
-#include "ash/common/shell_window_ids.h" |
#include "ash/common/wallpaper/wallpaper_controller.h" |
#include "ash/common/wallpaper/wallpaper_delegate.h" |
#include "ash/common/wm_shell.h" |
-#include "ash/public/interfaces/container.mojom.h" |
+#include "ash/public/cpp/shell_window_ids.h" |
#include "ash/shell.h" |
#include "base/bind.h" |
#include "base/command_line.h" |
@@ -89,6 +88,7 @@ |
#include "content/public/browser/web_ui.h" |
#include "media/audio/sounds/sounds_manager.h" |
#include "services/ui/public/cpp/property_type_converters.h" |
+#include "services/ui/public/interfaces/window_manager.mojom.h" |
#include "ui/aura/window.h" |
#include "ui/base/ime/chromeos/extension_ime_util.h" |
#include "ui/base/ime/chromeos/input_method_manager.h" |
@@ -1132,9 +1132,10 @@ void LoginDisplayHostImpl::InitLoginWindowAndView() { |
ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |
ash::kShellWindowId_LockScreenContainer); |
} else { |
- params.mus_properties[ash::mojom::kWindowContainer_Property] = |
+ using ui::mojom::WindowManager; |
+ params.mus_properties[WindowManager::kInitialContainerId_Property] = |
mojo::ConvertTo<std::vector<uint8_t>>( |
- static_cast<int32_t>(ash::mojom::Container::LOGIN_WINDOWS)); |
+ ash::kShellWindowId_LockScreenContainer); |
} |
login_window_ = new views::Widget; |
params.delegate = new LoginWidgetDelegate(login_window_); |