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

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: Re-ordered static function in Label. 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
« no previous file with comments | « 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..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);
« no previous file with comments | « ui/views/controls/label.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698