Commit b438c792 authored by Sara Kato's avatar Sara Kato Committed by Commit Bot

Show accelerator confirmation dialog on signin screen, follow up

Follow up of
https://chromium-review.googlesource.com/c/chromium/src/+/1144581

Bug: 860093
Change-Id: I0b243881c2f2ae49f6c4ab31edeffcaf84bf32a0
Reviewed-on: https://chromium-review.googlesource.com/1150951Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Commit-Queue: Sara Kato <sarakato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578198}
parent eddae27e
......@@ -38,13 +38,13 @@ AcceleratorConfirmationDialog::AcceleratorConfirmationDialog(
// Parent the dialog widget to the LockSystemModalContainer to ensure that it
// gets displayed on lock/signin screen.
gfx::NativeView parent = Shell::GetContainer(
ash::Shell::GetPrimaryRootWindow(), kShellWindowId_SystemModalContainer);
if (Shell::Get()->session_controller()->IsUserSessionBlocked())
parent = Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),
kShellWindowId_LockSystemModalContainer);
views::Widget* widget = CreateDialogWidget(this, nullptr, parent);
views::Widget* widget = CreateDialogWidget(
this, nullptr,
Shell::GetContainer(
ash::Shell::GetPrimaryRootWindow(),
Shell::Get()->session_controller()->IsUserSessionBlocked()
? kShellWindowId_LockSystemModalContainer
: kShellWindowId_SystemModalContainer));
widget->Show();
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment