Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1547)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/stacking_controller.cc

Issue 19945004: Modal window in user session not blocks user adding screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/session_state_delegate.h ('K') | « ash/wm/event_client_impl.cc ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/stacking_controller.cc
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index 24f38d5f4b82d4905f9be5db6458fa468007a7a3..026924c2350bee8e268c25ce52e4d2ddfb15d9f3 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -129,8 +129,7 @@ aura::Window* StackingController::GetSystemModalContainer(
// background pages) assume that the window belongs to user session.
SessionStateDelegate* session_state_delegate =
Shell::GetInstance()->session_state_delegate();
- if ((!session_state_delegate->IsScreenLocked() &&
- session_state_delegate->IsActiveUserSessionStarted()) ||
+ if (!session_state_delegate->IsUserSessionBlocked() ||
!window->transient_parent()) {
return GetContainerById(root,
internal::kShellWindowId_SystemModalContainer);
« ash/session_state_delegate.h ('K') | « ash/wm/event_client_impl.cc ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698