ui/views/controls/label_unittest.cc - Issue 1773063002: MacViews: Fix failing label-related views_unittests after r377477

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: ui/views/controls/label_unittest.cc

Issue 1773063002: MacViews: Fix failing label-related views_unittests after r377477 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: I like this better Created 4 years, 9 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: ui/views/controls/label_unittest.cc

diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc

index 9d0743341ea92c81d9c7181a68cd23ebe46fb1df..63a12a85c7f8b9ce54230be321feb915442dab96 100644

--- a/ui/views/controls/label_unittest.cc

+++ b/ui/views/controls/label_unittest.cc

@@ -322,7 +322,7 @@ TEST_F(LabelTest, TextChangeWithoutLayout) {

TEST_F(LabelTest, EmptyLabelSizing) {

Label label;

- const gfx::Size expected_size(0, gfx::FontList().GetHeight());

+ const gfx::Size expected_size(0, label.font_list().GetHeight());

EXPECT_EQ(expected_size, label.GetPreferredSize());

label.SetMultiLine(!label.multi_line());

EXPECT_EQ(expected_size, label.GetPreferredSize());

« no previous file with comments | « no previous file | ui/views/controls/styled_label.cc » ('j') | ui/views/controls/styled_label.cc » ('J')