diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 20:51:19 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 20:51:19 +0000 |
| commit | a32bd2113f84e91c5d9d06aae77fae0c2e0dcc9b (patch) | |
| tree | c8070d3d1315ddc5ca29de2be6015e811ed50fbf /views/controls/label_unittest.cc | |
| parent | e27a5f5229ae9c5257569c1c8d0f632c115a5cd7 (diff) | |
| download | chromium_src-a32bd2113f84e91c5d9d06aae77fae0c2e0dcc9b.zip chromium_src-a32bd2113f84e91c5d9d06aae77fae0c2e0dcc9b.tar.gz chromium_src-a32bd2113f84e91c5d9d06aae77fae0c2e0dcc9b.tar.bz2 | |
Convert Label::GetFont() to unix_hacker style. Original patch by Thiago Farina (see http://codereview.chromium.org/1580002 ), r=me.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1528009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label_unittest.cc')
| -rw-r--r-- | views/controls/label_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc index ab4b1e9..5ea20b3 100644 --- a/views/controls/label_unittest.cc +++ b/views/controls/label_unittest.cc @@ -22,7 +22,7 @@ TEST(LabelTest, FontPropertyCourier) { std::wstring font_name(L"courier"); gfx::Font font = gfx::Font::CreateFont(font_name, 30); label.SetFont(font); - gfx::Font font_used = label.GetFont(); + gfx::Font font_used = label.font(); EXPECT_EQ(font_name, font_used.FontName()); EXPECT_EQ(30, font_used.FontSize()); } @@ -33,7 +33,7 @@ TEST(LabelTest, FontPropertyArial) { std::wstring font_name(L"arial"); gfx::Font font = gfx::Font::CreateFont(font_name, 30); label.SetFont(font); - gfx::Font font_used = label.GetFont(); + gfx::Font font_used = label.font(); EXPECT_EQ(font_name, font_used.FontName()); EXPECT_EQ(30, font_used.FontSize()); } |