| 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 {
|
|
|