Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc |
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc |
index 95beacfd8eb009f0e9cd680193d2f10c5dea38e7..fb8cf24cce737c4dbbd7c1d67d5bbd26536d0252 100644 |
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc |
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc |
@@ -140,9 +140,12 @@ void ChromeNativeAppWindowViewsAuraAsh::OnBeforeWidgetInit( |
views::Widget* widget) { |
ChromeNativeAppWindowViewsAura::OnBeforeWidgetInit(create_params, init_params, |
widget); |
- if (create_params.is_ime_window) { |
- // Put ime windows into the ime window container on the primary display. |
- int container_id = ash::kShellWindowId_ImeWindowParentContainer; |
+ if (create_params.is_ime_window || create_params.show_on_lock_screen) { |
+ // Put ime windows and lock screen windows into their respective window |
+ // containers on the primary display. |
+ int container_id = create_params.is_ime_window |
+ ? ash::kShellWindowId_ImeWindowParentContainer |
+ : ash::kShellWindowId_LockActionHandlerContainer; |
if (ash_util::IsRunningInMash()) { |
init_params->mus_properties |
[ui::mojom::WindowManager::kContainerId_InitProperty] = |