Add a minimum cross axis size to BoxLayout.

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 572 matching lines @@
     layout->SetFlexForView(v1, 1);
     layout->SetFlexForView(v2, 1);
     layout->SetFlexForView(v3, 1);
     host_->Layout();
     EXPECT_EQ(gfx::Rect(0, 0, 20, 3).ToString(), v1->bounds().ToString());
     EXPECT_EQ(gfx::Rect(0, 3, 20, 14).ToString(), v2->bounds().ToString());
     EXPECT_EQ(gfx::Rect(0, 17, 20, 3).ToString(), v3->bounds().ToString());
   }
 }
 
+TEST_F(BoxLayoutTest, MinimumCrossAxisVertical) {
+  BoxLayout* layout = new BoxLayout(BoxLayout::kVertical, 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(30, 10), layout->GetPreferredSize(host_.get()));
+}
+
+TEST_F(BoxLayoutTest, MinimumCrossAxisHorizontal) {
+  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