| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 1bade434dd44a35b45a7547c5bd7dd0329067b33..d1a057f6b6bf356caddfe4f275219778d4f2d110 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -743,6 +743,18 @@ void Shell::OnAppTerminating() {
|
|
|
| void Shell::OnLockStateChanged(bool locked) {
|
| FOR_EACH_OBSERVER(ShellObserver, observers_, OnLockStateChanged(locked));
|
| +#ifndef NDEBUG
|
| + // Make sure that there is no system modal in Lock layer when unlocked.
|
| + if (!locked) {
|
| + std::vector<aura::Window*> containers = GetContainersFromAllRootWindows(
|
| + internal::kShellWindowId_LockSystemModalContainer,
|
| + GetPrimaryRootWindow());
|
| + for (std::vector<aura::Window*>::const_iterator iter = containers.begin();
|
| + iter != containers.end(); ++iter) {
|
| + DCHECK_EQ(0u, (*iter)->children().size());
|
| + }
|
| + }
|
| +#endif
|
| }
|
|
|
| void Shell::CreateLauncher() {
|
|
|