diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:31:10 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 17:31:10 +0000 |
| commit | 65f73a3a996bdbaa167e38704df092aa39b53d3a (patch) | |
| tree | f35068757a31bd1efe03996c8a58635dc7edb588 /views/grid_layout_unittest.cc | |
| parent | 3c39333a11a67ffe72a8989be898dca8421d573b (diff) | |
| download | chromium_src-65f73a3a996bdbaa167e38704df092aa39b53d3a.zip chromium_src-65f73a3a996bdbaa167e38704df092aa39b53d3a.tar.gz chromium_src-65f73a3a996bdbaa167e38704df092aa39b53d3a.tar.bz2 | |
Remove even more ATL dependencies.
Review URL: http://codereview.chromium.org/115309
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/grid_layout_unittest.cc')
| -rw-r--r-- | views/grid_layout_unittest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/views/grid_layout_unittest.cc b/views/grid_layout_unittest.cc index 57bfa83..cd38fc8 100644 --- a/views/grid_layout_unittest.cc +++ b/views/grid_layout_unittest.cc @@ -53,7 +53,7 @@ class GridLayoutTest : public testing::Test { } gfx::Size pref; - CRect bounds; + gfx::Rect bounds; View host; GridLayout* layout; }; @@ -78,7 +78,7 @@ class GridLayoutAlignmentTest : public testing::Test { } } - void TestAlignment(GridLayout::Alignment alignment, CRect* bounds) { + void TestAlignment(GridLayout::Alignment alignment, gfx::Rect* bounds) { ColumnSet* c1 = layout->AddColumnSet(0); c1->AddColumn(alignment, alignment, 1, GridLayout::USE_PREF, 0, 0); layout->StartRow(1, 0); @@ -87,7 +87,7 @@ class GridLayoutAlignmentTest : public testing::Test { EXPECT_TRUE(gfx::Size(10, 20) == pref); host.SetBounds(0, 0, 100, 100); layout->Layout(&host); - *bounds = v1.bounds().ToRECT(); + *bounds = v1.bounds(); RemoveAll(); } @@ -97,27 +97,27 @@ class GridLayoutAlignmentTest : public testing::Test { }; TEST_F(GridLayoutAlignmentTest, Fill) { - CRect bounds; + gfx::Rect bounds; TestAlignment(GridLayout::FILL, &bounds); - EXPECT_TRUE(CRect(0, 0, 100, 100) == bounds); + EXPECT_TRUE(gfx::Rect(0, 0, 100, 100) == bounds); } TEST_F(GridLayoutAlignmentTest, Leading) { - CRect bounds; + gfx::Rect bounds; TestAlignment(GridLayout::LEADING, &bounds); - EXPECT_TRUE(CRect(0, 0, 10, 20) == bounds); + EXPECT_TRUE(gfx::Rect(0, 0, 10, 20) == bounds); } TEST_F(GridLayoutAlignmentTest, Center) { - CRect bounds; + gfx::Rect bounds; TestAlignment(GridLayout::CENTER, &bounds); - EXPECT_TRUE(CRect(45, 40, 55, 60) == bounds); + EXPECT_TRUE(gfx::Rect(45, 40, 55, 60) == bounds); } TEST_F(GridLayoutAlignmentTest, Trailing) { - CRect bounds; + gfx::Rect bounds; TestAlignment(GridLayout::TRAILING, &bounds); - EXPECT_TRUE(CRect(90, 80, 100, 100) == bounds); + EXPECT_TRUE(gfx::Rect(90, 80, 100, 100) == bounds); } TEST_F(GridLayoutTest, TwoColumns) { |