Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/views/controls/styled_label_unittest.cc

Issue 2734113006: "Bootstrap" a toolkit-views Typography spec. (Closed)
Patch Set: fix windows Created 3 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
« ui/views/controls/label.h ('K') | « ui/views/controls/label.cc ('k') | ui/views/controls/tabbed_pane/tabbed_pane.cc » ('j') | ui/views/style/typography.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/styled_label_unittest.cc
diff --git a/ui/views/controls/styled_label_unittest.cc b/ui/views/controls/styled_label_unittest.cc
index 806a75c0ca34431943c62757943b557d55522faa..68a6720c7b886b98ed921050a942b02beb209a75 100644
--- a/ui/views/controls/styled_label_unittest.cc
+++ b/ui/views/controls/styled_label_unittest.cc
@@ -489,7 +489,7 @@ TEST_F(StyledLabelTest, SetBaseFontList) {
std::string font_name("arial");
gfx::Font font(font_name, 30);
styled()->SetBaseFontList(gfx::FontList(font));
- Label label(ASCIIToUTF16(text), gfx::FontList(font));
+ Label label(ASCIIToUTF16(text), Label::CustomFont{gfx::FontList(font)});
styled()->SetBounds(0,
0,
« ui/views/controls/label.h ('K') | « ui/views/controls/label.cc ('k') | ui/views/controls/tabbed_pane/tabbed_pane.cc » ('j') | ui/views/style/typography.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698