[Password Generation] Update UI to match final mocks.

ui/views/controls/styled_label.h

 // Copyright 2013 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.
 
 #ifndef UI_VIEWS_CONTROLS_STYLED_LABEL_H_
 #define UI_VIEWS_CONTROLS_STYLED_LABEL_H_
 
 #include <list>
 #include <map>
 
 #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"
 #include "ui/views/view.h"
 
 namespace views {
 
 class Link;
 class StyledLabelListener;
 
@@ skipping 29 matching lines @@
     bool is_link;
   };
 
   // Note that any trailing whitespace in |text| will be trimmed.
   StyledLabel(const base::string16& text, StyledLabelListener* listener);
   virtual ~StyledLabel();
 
   // 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);
 
   // Sets the default style to use for any part of the text that isn't within
   // a range set by AddStyleRange.
   void SetDefaultStyle(const RangeStyleInfo& style_info);
 
   // Sets the color of the background on which the label is drawn. This won't
   // be explicitly drawn, but the label will force the text color to be
@@ skipping 34 matching lines @@
 
   // Calculates how to layout child views, creates them and sets their size
   // and position. |width| is the horizontal space, in pixels, that the view
   // has to work with. If |dry_run| is true, the view hierarchy is not touched.
   // The return value is the necessary size.
   gfx::Size CalculateAndDoLayout(int width, bool dry_run);
 
   // 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_;
 
   // The listener that will be informed of link clicks.
   StyledLabelListener* listener_;
 
   // The ranges that should be linkified, sorted by start position.
   StyleRanges style_ranges_;
 
@@ skipping 12 matching lines @@
   // Controls whether the text is automatically re-colored to be readable on the
   // background.
   bool auto_color_readability_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(StyledLabel);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_STYLED_LABEL_H_