[Password Generation] Update Aura UI

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>
 
@@ skipping 55 matching lines @@
   void SetBaseFontList(const gfx::FontList& font_list);
 
   // 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);
 
+  // Additional spacing between lines.
+  void SetInterlineSpacing(int spacing_in_px);

[Evan Stade, 2014/06/19 00:16:36]

It would be more CSS-like if you made this control the line height (i.e. total
spacing between lines, instead of additional spacing between lines).

Also it should probably be a multiplicative factor, e.g. 1.5 times normal line
height, so that it grows as the font size grows.

[Garrett Casto, 2014/06/20 23:47:01]

Are you saying that a value of 0 should leave no space between two lines of text
(e.g. not the current default spacing)? 
I can make it multiplicative if that's preferable. Scott, what's your opinion on
this?

[Evan Stade, 2014/06/23 18:20:40]

yes. You could always redefine 0 to be "reset to default", but in CSS,
line-height: 0 can actually put an entire paragraph on a single line.

+
   // 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
   // readable over it.
   void SetDisplayedOnBackgroundColor(SkColor color);
   SkColor displayed_on_background_color() const {
     return displayed_on_background_color_;
   }
 
   void set_auto_color_readability_enabled(bool auto_color_readability) {
     auto_color_readability_enabled_ = auto_color_readability;
@@ skipping 29 matching lines @@
   // 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_;
 
+  // Additional spacing, in pixels, added between lines.
+  int interline_spacing_;
+
   // 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_