summaryrefslogtreecommitdiffstats
path: root/views/controls/label_unittest.cc
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-15 02:16:10 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-15 02:16:10 +0000
commit7322c44018c4e7b8bd58c67f52986660fb365d76 (patch)
tree4bb67ec23689e83682a5aa228e3b8c402880baa8 /views/controls/label_unittest.cc
parent0c875075a6c45e9979b8345e5f5f9d4b747e05c3 (diff)
downloadchromium_src-7322c44018c4e7b8bd58c67f52986660fb365d76.zip
chromium_src-7322c44018c4e7b8bd58c67f52986660fb365d76.tar.gz
chromium_src-7322c44018c4e7b8bd58c67f52986660fb365d76.tar.bz2
ChromeFont->gfx::Font
Does not rename the files yet. http://crbug.com/11387 Review URL: http://codereview.chromium.org/113441 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label_unittest.cc')
-rw-r--r--views/controls/label_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index 1ac74b1..54ee5ca 100644
--- a/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -17,9 +17,9 @@ const int kMinTextDimension = 4;
TEST(LabelTest, FontProperty) {
Label label;
std::wstring font_name(L"courier");
- ChromeFont font = ChromeFont::CreateFont(font_name, 30);
+ gfx::Font font = gfx::Font::CreateFont(font_name, 30);
label.SetFont(font);
- ChromeFont font_used = label.GetFont();
+ gfx::Font font_used = label.GetFont();
EXPECT_STREQ(font_name.c_str(), font_used.FontName().c_str());
EXPECT_EQ(30, font_used.FontSize());
}