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

Unified Diff: ash/shell.cc

Issue 9181012: Don't activate a window if screen is locked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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 | « no previous file | ash/wm/activation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 7d9863ef14cdd0030f8b02403922956de22c34d0..6627f8ec0870e5e2704e06dec4374fa6808495dc 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -377,15 +377,7 @@ void Shell::ToggleAppList() {
bool Shell::IsScreenLocked() const {
const aura::Window* lock_screen_container = GetContainer(
internal::kShellWindowId_LockScreenContainer);
- const aura::Window::Windows& lock_screen_windows =
- lock_screen_container->children();
- aura::Window::Windows::const_iterator lock_screen_it =
- std::find_if(lock_screen_windows.begin(), lock_screen_windows.end(),
- std::mem_fun(&aura::Window::IsVisible));
- if (lock_screen_it != lock_screen_windows.end())
- return true;
-
- return false;
+ return lock_screen_container->StopsEventPropagation();
}
bool Shell::IsModalWindowOpen() const {
« no previous file with comments | « no previous file | ash/wm/activation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698