ash/wm/stacking_controller.cc - Issue 19945004: Modal window in user session not blocks user adding screen.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fixed compilation for win. 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:

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);

« no previous file with comments | « ash/wm/event_client_impl.cc ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »