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

Unified Diff: ash/wm/system_modal_container_layout_manager.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/stacking_controller.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_modal_container_layout_manager.cc
diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc
index 9d1ed1b3cbbfc6b19e6e8f64d29ee172a69b4d7c..9b23e62f3d99b1b74ed14cce1d81e31627d4c7bd 100644
--- a/ash/wm/system_modal_container_layout_manager.cc
+++ b/ash/wm/system_modal_container_layout_manager.cc
@@ -66,9 +66,7 @@ void SystemModalContainerLayoutManager::OnWindowAddedToLayout(
child->type() == aura::client::WINDOW_TYPE_POPUP);
DCHECK(
container_->id() != internal::kShellWindowId_LockSystemModalContainer ||
- Shell::GetInstance()->session_state_delegate()->IsScreenLocked() ||
- !Shell::GetInstance()->session_state_delegate()->
- IsActiveUserSessionStarted());
+ Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked());
child->AddObserver(this);
if (child->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_NONE)
@@ -121,11 +119,6 @@ void SystemModalContainerLayoutManager::OnWindowDestroying(
modal_background_ = NULL;
}
-
-////////////////////////////////////////////////////////////////////////////////
-// SystemModalContainerLayoutManager,
-// SystemModalContainerEventFilter::Delegate implementation:
-
bool SystemModalContainerLayoutManager::CanWindowReceiveEvents(
aura::Window* window) {
// We could get when we're at lock screen and there is modal window at
@@ -138,7 +131,7 @@ bool SystemModalContainerLayoutManager::CanWindowReceiveEvents(
return true;
// This container can not handle events if the screen is locked and it is not
// above the lock screen layer (crbug.com/110920).
- if (Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
+ if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked() &&
container_->id() < ash::internal::kShellWindowId_LockScreenContainer)
return true;
return wm::GetActivatableWindow(window) == modal_window();
« no previous file with comments | « ash/wm/stacking_controller.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698