Commit 5ce4520c authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

cros: Hide user pods when Gaia dialog is open

Bug: 1012502
Change-Id: If4df2204899acb6c6757fcb6ca8272ded58b9284
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2002917
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: default avatarToni Baržić <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733291}
parent 99b74338
...@@ -1256,16 +1256,10 @@ void LockContentsView::OnFocusLeavingLockScreenApps(bool reverse) { ...@@ -1256,16 +1256,10 @@ void LockContentsView::OnFocusLeavingLockScreenApps(bool reverse) {
void LockContentsView::OnOobeDialogStateChanged(OobeDialogState state) { void LockContentsView::OnOobeDialogStateChanged(OobeDialogState state) {
oobe_dialog_visible_ = state != OobeDialogState::HIDDEN; oobe_dialog_visible_ = state != OobeDialogState::HIDDEN;
// Deactivate the lock screen widget while the dialog is visible to // Show either oobe dialog or lock screen.
// prevent lock screen from grabbing focus and hiding the OOBE dialog. SetVisible(!oobe_dialog_visible_);
GetWidget()->widget_delegate()->SetCanActivate(!oobe_dialog_visible_);
// Block login screen events, to prevent actions on user pods shown in the if (!oobe_dialog_visible_ && primary_big_view_)
// background (e.g. hover over user name, or clicking a pod) from having
// effect.
set_can_process_events_within_subtree(!oobe_dialog_visible_);
if (state == OobeDialogState::HIDDEN && primary_big_view_)
primary_big_view_->RequestFocus(); primary_big_view_->RequestFocus();
} }
......
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