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

Unified Diff: ash/shell.cc

Issue 2735983006: Renames WmWindowUserData and converts to using aura (Closed)
Patch Set: moor aura Created 3 years, 9 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/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 7926e0c1de12d9bc135a414ea3e88d757b55c712..e247379fc590926d1f53abce75e7af66e5d5bd74 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -306,11 +306,10 @@ void Shell::OnLockStateChanged(bool locked) {
#ifndef NDEBUG
// Make sure that there is no system modal in Lock layer when unlocked.
if (!locked) {
- std::vector<WmWindow*> containers = wm::GetContainersFromAllRootWindows(
- kShellWindowId_LockSystemModalContainer,
- WmWindow::Get(GetPrimaryRootWindow()));
- for (WmWindow* container : containers)
- DCHECK(container->GetChildren().empty());
+ aura::Window::Windows containers = wm::GetContainersFromAllRootWindows(
+ kShellWindowId_LockSystemModalContainer, GetPrimaryRootWindow());
+ for (aura::Window* container : containers)
+ DCHECK(container->children().empty());
}
#endif
}

Powered by Google App Engine
This is Rietveld 408576698