BoxLayout: Added set_collapse_when_hidden(), like views::Label.

ui/views/layout/box_layout_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/layout/box_layout.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/test/test_views.h"
 #include "ui/views/view.h"
 
@@ skipping 115 matching lines @@
 TEST_F(BoxLayoutTest, NoSpace) {
   BoxLayout* layout = new BoxLayout(BoxLayout::kHorizontal, 10, 10, 10);
   host_->SetLayoutManager(layout);
   View* childView = new StaticSizedView(gfx::Size(20, 20));
   host_->AddChildView(childView);
   host_->SetBounds(0, 0, 10, 10);
   host_->Layout();
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), childView->bounds());
 }
 
+TEST_F(BoxLayoutTest, InvisibleHost) {
+  BoxLayout* layout = new BoxLayout(BoxLayout::kHorizontal, 10, 10, 20);
+  host_->SetLayoutManager(layout);
+  host_->SetVisible(false);
+  // No collapse_when_hidden; expect full size.
+  EXPECT_EQ(gfx::Size(20, 20), layout->GetPreferredSize(host_.get()));
+
+  // Set collapse_when_hidden; expect 0x0.
+  layout->set_collapse_when_hidden(true);
+  EXPECT_EQ(gfx::Size(), layout->GetPreferredSize(host_.get()));
+}
+
 TEST_F(BoxLayoutTest, InvisibleChild) {
   BoxLayout* layout = new BoxLayout(BoxLayout::kHorizontal, 10, 10, 10);
   host_->SetLayoutManager(layout);
   View* v1 = new StaticSizedView(gfx::Size(20, 20));
   v1->SetVisible(false);
   host_->AddChildView(v1);
   View* v2 = new StaticSizedView(gfx::Size(10, 10));
   host_->AddChildView(v2);
   EXPECT_EQ(gfx::Size(30, 30), layout->GetPreferredSize(host_.get()));
   host_->SetBounds(0, 0, 30, 30);
@@ skipping 475 matching lines @@
   BoxLayout* layout = new BoxLayout(BoxLayout::kHorizontal, 0, 0, 0);
   host_->SetLayoutManager(layout);
   View* v1 = new StaticSizedView(gfx::Size(20, 10));
   host_->AddChildView(v1);
   layout->set_minimum_cross_axis_size(30);
 
   EXPECT_EQ(gfx::Size(20, 30), layout->GetPreferredSize(host_.get()));
 }
 
 }  // namespace views