Add line height setting to views::Label & use it for notifications.

ui/views/controls/label.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 99 matching lines @@
   // applies to every label that originates from the Chrome UI. However, if the
   // label originates from a web page, its directionality is auto-detected.
   void set_directionality_mode(DirectionalityMode mode) {
     directionality_mode_ = mode;
   }
 
   DirectionalityMode directionality_mode() const {
     return directionality_mode_;
   }
 
+  // Get or set the distance in pixels between baselines of multi-line text.
+  // Default is -1, indicating the distance between lines should be the standard

[msw, 2013/04/18 03:58:52]

nit: s/-1/0/

[dharcourt, 2013/04/18 17:50:27]

Done.

+  // one for the label's text, font, and platform.
+  int line_height() const { return line_height_; }
+  void SetLineHeight(int height);
+
   // Get or set if the label text can wrap on multiple lines; default is false.
   bool is_multi_line() const { return is_multi_line_; }
   void SetMultiLine(bool multi_line);
 
   // Sets whether the label text can be split on words.
   // Default is false. This only works when is_multi_line is true.
   void SetAllowCharacterBreak(bool allow_character_break);
 
   // Sets whether the label text should be elided in the middle or end (if
   // necessary). The default is to not elide at all.
@@ skipping 105 matching lines @@
   SkColor background_color_;
 
   // Set to true once the corresponding setter is invoked.
   bool enabled_color_set_;
   bool disabled_color_set_;
   bool background_color_set_;
 
   bool auto_color_readability_;
   mutable gfx::Size text_size_;
   mutable bool text_size_valid_;
+  int line_height_;
   bool is_multi_line_;
   bool allow_character_break_;
   ElideBehavior elide_behavior_;
   gfx::HorizontalAlignment horizontal_alignment_;
   string16 tooltip_text_;
   // Whether to collapse the label when it's not visible.
   bool collapse_when_hidden_;
   // The following member variable is used to control whether the
   // directionality is auto-detected based on first strong directionality
   // character or is determined by chrome UI's locale.
@@ skipping 16 matching lines @@
   // The cached heights to avoid recalculation in GetHeightForWidth().
   std::vector<gfx::Size> cached_heights_;
   int cached_heights_cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_