"Bootstrap" a toolkit-views Typography spec.

ui/views/controls/label.h

Index: ui/views/controls/label.h
diff --git a/ui/views/controls/label.h b/ui/views/controls/label.h
index 516368ee974367c7a711d497590ade90e1c02af3..11deac721b8dae52eabaa69d543e09bdafec4622 100644
--- a/ui/views/controls/label.h
+++ b/ui/views/controls/label.h
@@ -12,6 +12,7 @@
 #include "ui/gfx/render_text.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/selection_controller_delegate.h"
+#include "ui/views/style/typography.h"
 #include "ui/views/view.h"
 #include "ui/views/word_lookup_client.h"
 
@@ -33,9 +34,34 @@ class VIEWS_EXPORT Label : public View,
   // The padding for the focus border when rendering focused text.
   static const int kFocusBorderPadding;
 
+  // Helper to construct a Label that doesn't use the views::Typography spec.
+  // Using this causes Label to obtain colors from ui::NativeTheme and line
+  // spacing from gfx::FontList::GetHeight().
+  // TOOD(tapted): Audit users of this class when MD is default. Then add
+  // foreground/background colors, line spacing and everything else that
+  // views::TextContext abstracts away so the separate setters can be removed.
+  struct CustomFont {
+    // TODO(tapted): Change this to a size delta and font weight since that's
+    // typically all the callers really care about, and would allow Label to
+    // guarantee caching of the FontList in ResourceBundle.
+    const gfx::FontList& font_list;
+  };
+
+  // Create Labels with TextContext::CONTROL_LABEL and TextStyle::PRIMARY.

[Peter Kasting, 2017/03/14 23:53:33]

Nit: Function comments should be descriptive ("Creates"), not imperative; see
http://google.github.io/styleguide/cppguide.html#Function_Comments .
 (multiple places)

+  // TODO(tapted): Remove these. Callers must specify a context or use the
+  // constructor taking a CustomFont.
   Label();
   explicit Label(const base::string16& text);
-  Label(const base::string16& text, const gfx::FontList& font_list);
+
+  // Construct a Label in the given |context|. The style can change later, so
+  // provide a default. The TextContext is fixed.
+  Label(const base::string16& text,
+        TextContext context,
+        TextStyle style = TextStyle::PRIMARY);
+
+  // Construct a Label with the given |font| description.
+  Label(const base::string16& text, const CustomFont& font);
+
   ~Label() override;
 
   static const gfx::FontList& GetDefaultFontList();
@@ -43,6 +69,7 @@ class VIEWS_EXPORT Label : public View,
   // Gets or sets the fonts used by this label.
   const gfx::FontList& font_list() const { return render_text_->font_list(); }
 
+  // TODO(tapted): Replace this with a private method, e.g., OnFontChanged().
   virtual void SetFontList(const gfx::FontList& font_list);
 
   // Get or set the label text.