Add ability to set the border insets of a box layout.

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 37 matching lines @@
   host_->AddChildView(v1);
   View* v2 = new StaticSizedView(gfx::Size(10, 10));
   host_->AddChildView(v2);
   EXPECT_EQ(gfx::Size(20, 20), layout_->GetPreferredSize(host_.get()));
   host_->SetBounds(0, 0, 20, 20);
   layout_->Layout(host_.get());
   EXPECT_EQ(gfx::Rect(0, 0, 20, 10), v1->bounds());
   EXPECT_EQ(gfx::Rect(0, 10, 20, 10), v2->bounds());
 }
 
+TEST_F(BoxLayoutTest, SetInsideBorderInsets) {
+  layout_.reset(new BoxLayout(BoxLayout::kHorizontal, 10, 20, 0));
+  View* v1 = new StaticSizedView(gfx::Size(10, 20));
+  host_->AddChildView(v1);
+  View* v2 = new StaticSizedView(gfx::Size(10, 10));
+  host_->AddChildView(v2);
+  EXPECT_EQ(gfx::Size(40, 60), layout_->GetPreferredSize(host_.get()));
+  host_->SetBounds(0, 0, 40, 60);
+  layout_->Layout(host_.get());
+  EXPECT_EQ(gfx::Rect(10, 20, 10, 20), v1->bounds());
+  EXPECT_EQ(gfx::Rect(20, 20, 10, 20), v2->bounds());
+
+  layout_->set_inside_border_insets(
+      gfx::Insets(5, 10, 15, 20));
+  EXPECT_EQ(gfx::Size(50, 40), layout_->GetPreferredSize(host_.get()));
+  host_->SetBounds(0, 0, 50, 40);
+  layout_->Layout(host_.get());
+  EXPECT_EQ(gfx::Rect(10, 5, 10, 20), v1->bounds());
+  EXPECT_EQ(gfx::Rect(20, 5, 10, 20), v2->bounds());
+}
+
 TEST_F(BoxLayoutTest, Spacing) {
   layout_.reset(new BoxLayout(BoxLayout::kHorizontal, 7, 7, 8));
   View* v1 = new StaticSizedView(gfx::Size(10, 20));
   host_->AddChildView(v1);
   View* v2 = new StaticSizedView(gfx::Size(10, 20));
   host_->AddChildView(v2);
   EXPECT_EQ(gfx::Size(42, 34), layout_->GetPreferredSize(host_.get()));
   host_->SetBounds(0, 0, 100, 100);
   layout_->Layout(host_.get());
   EXPECT_EQ(gfx::Rect(7, 7, 10, 86), v1->bounds());
@@ skipping 171 matching lines @@
 
   // Aligns children to the end of the host vertically, accounting for the
   // inside border spacing.
   layout_->set_main_axis_alignment(BoxLayout::MAIN_AXIS_ALIGNMENT_END);
   layout_->Layout(host_.get());
   EXPECT_EQ(gfx::Rect(10, 50, 20, 20).ToString(), v1->bounds().ToString());
   EXPECT_EQ(gfx::Rect(10, 80, 20, 10).ToString(), v2->bounds().ToString());
 }
 
 }  // namespace views