| Index: ui/views/controls/label.cc
|
| diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
|
| index f03084ae6bdcba757b93cf35a79000464d2bcb90..46f86389f1503139bcf9d448ef887919c0f91ba7 100644
|
| --- a/ui/views/controls/label.cc
|
| +++ b/ui/views/controls/label.cc
|
| @@ -28,15 +28,6 @@
|
| #include "ui/native_theme/native_theme.h"
|
|
|
| namespace views {
|
| -namespace {
|
| -
|
| -const gfx::FontList& GetDefaultFontList() {
|
| - ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| - return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| // static
|
| const char Label::kViewClassName[] = "Label";
|
| const int Label::kFocusBorderPadding = 1;
|
| @@ -54,6 +45,12 @@ Label::Label(const base::string16& text, const gfx::FontList& font_list) {
|
| Label::~Label() {
|
| }
|
|
|
| +// static
|
| +const gfx::FontList& Label::GetDefaultFontList() {
|
| + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| + return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
|
| +}
|
| +
|
| void Label::SetFontList(const gfx::FontList& font_list) {
|
| is_first_paint_text_ = true;
|
| render_text_->SetFontList(font_list);
|
|
|