"Bootstrap" a toolkit-views Typography spec.

ui/views/controls/label.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/label.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <utility>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/default_style.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"

[Peter Kasting, 2017/03/17 02:26:00]

I think this #include can be removed now.

Also check if it can be removed from any other files where you've eliminated
references to ResourceBundle.

[tapted, 2017/03/17 10:33:10]

Done. Yeah - most of the client code files still use them for icons and things,
but I missed this one.

 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/native_cursor.h"
 #include "ui/views/selection_controller.h"
 
 namespace views {
 // static
 const char Label::kViewClassName[] = "Label";
 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,
+            typography::CONTEXT_CONTROL_LABEL,
+            typography::STYLE_PRIMARY) {}
+
+Label::Label(const base::string16& text, int text_context, int text_style)
+    : context_menu_contents_(this) {
+  Init(text, typography::GetFont(text_context, text_style));

[sky, 2017/03/16 16:23:51]

Is the plan to change other controls to call to GetFont()? For example, in
Textfield?

[Peter Kasting, 2017/03/17 02:26:00]

We probably should eventually... this is connected to my question elsewhere
about killing the ResourceBundle font enum.

[tapted, 2017/03/17 10:33:10]

Yes! Everything should be using style::GetFont().

ResourceBundle's enums have haunted me for ages and I want to delete them
(largely because 'BaseFont' is usually 13pt on Mac and 12pt everywhere else,
then there's arithmetic piled on top of that in a whole lot of Cocoa and other
code, so they're impossible to change)

 }
 
-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() {
 }
 
 // static
 const gfx::FontList& Label::GetDefaultFontList() {
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return rb.GetFontListWithDelta(ui::kLabelFontSizeDelta);
+  return typography::GetFont(typography::CONTEXT_CONTROL_LABEL,
+                             typography::STYLE_PRIMARY);
 }
 
 void Label::SetFontList(const gfx::FontList& font_list) {
   is_first_paint_text_ = true;
   render_text_->SetFontList(font_list);
   ResetLayout();
 }
 
 void Label::SetText(const base::string16& new_text) {
   if (new_text == text())
@@ skipping 983 matching lines @@
       .WriteText(GetSelectedText());
 }
 
 void Label::BuildContextMenuContents() {
   context_menu_contents_.AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
   context_menu_contents_.AddItemWithStringId(IDS_APP_SELECT_ALL,
                                              IDS_APP_SELECT_ALL);
 }
 
 }  // namespace views