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

Unified Diff: ash/shell.cc

Issue 22626003: Check if there is no window in LockSystemModalContainer when unlocked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert unnecessary change Created 7 years, 4 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 | no next file » | 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 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() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698