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

Unified Diff: ash/wm/event_client_impl.cc

Issue 18850003: Focus kept on login 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
Index: ash/wm/event_client_impl.cc
diff --git a/ash/wm/event_client_impl.cc b/ash/wm/event_client_impl.cc
index ab62f68dab9782ab85d2e6d77f365b36be051900..fcdc1b425d382c948e31b0135fff8e61d105c5ee 100644
--- a/ash/wm/event_client_impl.cc
+++ b/ash/wm/event_client_impl.cc
@@ -20,10 +20,10 @@ EventClientImpl::~EventClientImpl() {
bool EventClientImpl::CanProcessEventsWithinSubtree(
const aura::Window* window) const {
- const aura::RootWindow* root_window =
- window ? window->GetRootWindow() : NULL;
- if (Shell::GetInstance()->session_state_delegate()->IsScreenLocked() &&
- root_window) {
+ const aura::RootWindow* root_window = window ? window->GetRootWindow() : NULL;
+ if (!root_window)
+ return true;
+ if (Shell::GetInstance()->session_state_delegate()->IsUserSessionBlocked()) {
const aura::Window* lock_screen_containers = Shell::GetContainer(
root_window,
kShellWindowId_LockScreenContainersContainer);

Powered by Google App Engine
This is Rietveld 408576698