views/controls/label_unittest.cc - Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: views/controls/label_unittest.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: views/controls/label_unittest.cc

===================================================================

--- views/controls/label_unittest.cc (revision 55911)

+++ views/controls/label_unittest.cc (working copy)

@@ -31,11 +31,11 @@

TEST(LabelTest, FontPropertyArial) {

Label label;

std::wstring font_name(L"arial");

- gfx::Font font = gfx::Font::CreateFont(font_name, 30);

+ gfx::Font font(font_name, 30);

label.SetFont(font);

gfx::Font font_used = label.font();

- EXPECT_EQ(font_name, font_used.FontName());

- EXPECT_EQ(30, font_used.FontSize());

+ EXPECT_EQ(font_name, font_used.GetFontName());

+ EXPECT_EQ(30, font_used.GetFontSize());

}

TEST(LabelTest, TextProperty) {

« no previous file with comments | « views/controls/label.cc ('k') | views/controls/link.cc » ('j') | no next file with comments »