[Password Generation] Update UI to match final mocks.

ui/views/controls/styled_label.h

Index: ui/views/controls/styled_label.h
diff --git a/ui/views/controls/styled_label.h b/ui/views/controls/styled_label.h
index f600159ee3466c09f7e5039720ea5f4cc64e3c76..aa322f15efdce96bf38b2227d176a85d57fad9ae 100644
--- a/ui/views/controls/styled_label.h
+++ b/ui/views/controls/styled_label.h
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/gfx/font_list.h"
 #include "ui/gfx/range/range.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/link_listener.h"
@@ -60,6 +61,9 @@ class VIEWS_EXPORT StyledLabel : public View, public LinkListener {
   // Sets the text to be displayed, and clears any previous styling.
   void SetText(const base::string16& text);
 
+  // Sets the fonts used by all labels.
+  void SetFontList(const gfx::FontList& font_list);

[Evan Stade, 2014/02/03 18:49:15]

why isn't this part of RangeStyleInfo?

[Garrett Casto, 2014/02/04 17:54:57]

1) It's hard to calculate the height of a line when the height may change
depending on future text.
2) It doesn't seem necessary as no one was changing the font at all before this
point.

I'm also not sure if in principle we would want Chrome UI that changes font in
the same paragraph.

+
   // Marks the given range within |text_| with style defined by |style_info|.
   // |range| must be contained in |text_|.
   void AddStyleRange(const gfx::Range& range, const RangeStyleInfo& style_info);
@@ -114,6 +118,9 @@ class VIEWS_EXPORT StyledLabel : public View, public LinkListener {
   // The text to display.
   base::string16 text_;
 
+  // Fonts used to display text. Can be augmented by RangeStyleInfo.
+  gfx::FontList font_list_;
+
   // The default style to use for any part of the text that isn't within
   // a range in |style_ranges_|.
   RangeStyleInfo default_style_info_;