Commit 6b6fa832 authored by Yunke Zhou's avatar Yunke Zhou Committed by Commit Bot

Lock screen: ignore accelerator when system modal is open

Bug: 1011324
Change-Id: I4ae9d7cd8524ddfc294ea249d9992ad9a1a8b3c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2482263
Commit-Queue: Yunke Zhou <yunkez@google.com>
Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818463}
parent 2dc5c52c
...@@ -2343,7 +2343,11 @@ void LockContentsView::PerformAction(LoginAcceleratorAction action) { ...@@ -2343,7 +2343,11 @@ void LockContentsView::PerformAction(LoginAcceleratorAction action) {
ToggleSystemInfo(); ToggleSystemInfo();
return; return;
} }
Shell::Get()->login_screen_controller()->HandleAccelerator(action); // Do not allow accelerator action when system modal window is open except
// `kShowFeedback` which opens feedback tool on top of system modal.
if (!Shell::IsSystemModalWindowOpen() ||
action == LoginAcceleratorAction::kShowFeedback)
Shell::Get()->login_screen_controller()->HandleAccelerator(action);
} }
bool LockContentsView::GetSystemInfoVisibility() const { bool LockContentsView::GetSystemInfoVisibility() const {
......
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