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

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

Issue 2244003002: Materialized font style for TrayItemMore type system tray rows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into tray_item_popup_style Created 4 years, 3 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.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
sky 2016/09/15 22:51:01 When you move the declaration move the definition
bruthig 2016/09/16 01:01:34 Done.
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()) {
}
« ui/views/controls/label.h ('K') | « ui/views/controls/label.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698