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

Unified Diff: mash/wm/shelf_layout.cc

Issue 1492563002: Introduce mash/shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years 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 | « mash/wm/shelf_layout.h ('k') | mash/wm/window_manager_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/shelf_layout.cc
diff --git a/mash/wm/shelf_layout.cc b/mash/wm/shelf_layout.cc
index cdabe532b211a92a244eed64156a60fbdf576702..1b341cc728724d186ceca44aef83f60818910831 100644
--- a/mash/wm/shelf_layout.cc
+++ b/mash/wm/shelf_layout.cc
@@ -18,9 +18,9 @@ ShelfLayout::ShelfLayout(mus::Window* owner) : LayoutManager(owner) {
}
ShelfLayout::~ShelfLayout() {}
-void ShelfLayout::WindowAdded(mus::Window* window) {
- DCHECK_EQ(owner()->children().size(), 1U);
-}
+// We explicitly don't make assertions about the number of children in this
+// layout as the number of children can vary when the application providing the
+// shelf restarts.
void ShelfLayout::LayoutWindow(mus::Window* window) {
gfx::Size preferred_size = GetWindowPreferredSize(window);
« no previous file with comments | « mash/wm/shelf_layout.h ('k') | mash/wm/window_manager_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698