| Index: ui/views/controls/label.cc
|
| diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
|
| index 05322303bb6f85fef8affab9e3170459c0fbaa93..91fe747cbdfd404d47e26781c7d7c88a14cf2c89 100644
|
| --- a/ui/views/controls/label.cc
|
| +++ b/ui/views/controls/label.cc
|
| @@ -44,12 +44,17 @@ const int Label::kFocusBorderPadding = 1;
|
| Label::Label() : Label(base::string16()) {
|
| }
|
|
|
| -Label::Label(const base::string16& text) : Label(text, GetDefaultFontList()) {
|
| +Label::Label(const base::string16& text)
|
| + : Label(text, TextContext::CONTROL_LABEL, TextStyle::PRIMARY) {}
|
| +
|
| +Label::Label(const base::string16& text, TextContext context, TextStyle style)
|
| + : context_menu_contents_(this) {
|
| + Init(text, Typography::GetFont(context, style));
|
| }
|
|
|
| -Label::Label(const base::string16& text, const gfx::FontList& font_list)
|
| +Label::Label(const base::string16& text, const CustomFont& font)
|
| : context_menu_contents_(this) {
|
| - Init(text, font_list);
|
| + Init(text, font.font_list);
|
| }
|
|
|
| Label::~Label() {
|
| @@ -57,8 +62,7 @@ Label::~Label() {
|
|
|
| // static
|
| const gfx::FontList& Label::GetDefaultFontList() {
|
| - ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| - return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
|
| + return Typography::GetFont(TextContext::CONTROL_LABEL, TextStyle::PRIMARY);
|
| }
|
|
|
| void Label::SetFontList(const gfx::FontList& font_list) {
|
|
|