Chromium Code Reviews| Index: ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc |
| diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc |
| index 44e4f876e8b4b2c9a4ea4e70611fed0c38a0753d..ec59960096748485c96019174ed79ba4d99d305e 100644 |
| --- a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc |
| +++ b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc |
| @@ -40,7 +40,6 @@ class TabbedPaneTest : public ViewsTestBase, |
| virtual void SetUp() OVERRIDE { |
| ViewsTestBase::SetUp(); |
| tabbed_pane_ = new TabbedPane(); |
| - tabbed_pane_->set_use_native_win_control(true); |
| window_ = Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 100, 100)); |
| window_->Show(); |
| } |
| @@ -75,7 +74,9 @@ TEST_F(TabbedPaneTest, SizeAndLayout) { |
| // Check that the preferred size is larger than the largest child. |
| gfx::Size pref(tabbed_pane_->GetPreferredSize()); |
| - EXPECT_GT(pref.width(), 20); |
| + // The |tabbed_pane_| has no border. Therefor it should be as wide as the |
|
msw
2012/07/25 20:19:27
nit: "therefore" here and at 87
markusheintz_
2012/07/26 18:21:35
Done.
|
| + // widest tab. |
| + EXPECT_EQ(pref.width(), 20); |
|
msw
2012/07/25 20:19:27
EXPECT_GE would cover both impls then, right?
markusheintz_
2012/07/26 18:21:35
Correct. Done.
|
| EXPECT_GT(pref.height(), 10); |
| // The bounds of our children should be smaller than the tabbed pane's bounds. |
| @@ -83,7 +84,9 @@ TEST_F(TabbedPaneTest, SizeAndLayout) { |
| RunPendingMessages(); |
| gfx::Rect bounds(child1->bounds()); |
| EXPECT_GT(bounds.width(), 0); |
| - EXPECT_LT(bounds.width(), 100); |
| + // The |tabbed_pane_| has no border. Therefor the children should be as wide |
| + // as the |tabbed_pane_|. |
| + EXPECT_EQ(bounds.width(), 100); |
|
msw
2012/07/25 20:19:27
EXPECT_LE would cover both impls then, right?
markusheintz_
2012/07/26 18:21:35
Correct. Done.
|
| EXPECT_GT(bounds.height(), 0); |
| EXPECT_LT(bounds.height(), 200); |