| Index: ui/views/controls/label.cc
|
| diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
|
| index f03084ae6bdcba757b93cf35a79000464d2bcb90..3054f879c0566eecdc0813b4a93d7804a7059769 100644
|
| --- a/ui/views/controls/label.cc
|
| +++ b/ui/views/controls/label.cc
|
| @@ -28,19 +28,15 @@
|
| #include "ui/native_theme/native_theme.h"
|
|
|
| namespace views {
|
| -namespace {
|
| +// static
|
| +const char Label::kViewClassName[] = "Label";
|
| +const int Label::kFocusBorderPadding = 1;
|
|
|
| -const gfx::FontList& GetDefaultFontList() {
|
| +const gfx::FontList& Label::GetDefaultFontList() {
|
| ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
|
| return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
|
| }
|
|
|
| -} // namespace
|
| -
|
| -// static
|
| -const char Label::kViewClassName[] = "Label";
|
| -const int Label::kFocusBorderPadding = 1;
|
| -
|
| Label::Label() : Label(base::string16()) {
|
| }
|
|
|
|
|