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

ui/gfx/canvas.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_GFX_CANVAS_H_
 #define UI_GFX_CANVAS_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 106 matching lines @@
   // canvas after having initialized the canvas.
   // TODO(pkotwicz): Push the scale factor into skia::PlatformCanvas such that
   // this method can be private.
   void RecreateBackingCanvas(const gfx::Size& size,
                              ui::ScaleFactor scale_factor,
                              bool is_opaque);
 
   // Compute the size required to draw some text with the provided font.
   // Attempts to fit the text with the provided width and height. Increases
   // height and then width as needed to make the text fit. This method
-  // supports multiple lines.
+  // supports multiple lines. On Skia only a line_height can be specified and
+  // specifying a 0 value for it will cause the default height to be used.
   static void SizeStringInt(const string16& text,
                             const gfx::Font& font,
                             int* width, int* height,
+                            int line_height,
                             int flags);
 
   // Returns the number of horizontal pixels needed to display the specified
   // |text| with |font|.
   static int GetStringWidth(const string16& text, const gfx::Font& font);
 
   // Returns the default text alignment to be used when drawing text on a
   // gfx::Canvas based on the directionality of the system locale language.
   // This function is used by gfx::Canvas::DrawStringInt when the text alignment
   // is not specified.
@@ skipping 174 matching lines @@
   // Draws text with the specified color, font and location. The last argument
   // specifies flags for how the text should be rendered. It can be one of
   // TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT or TEXT_ALIGN_LEFT.
   void DrawStringInt(const string16& text,
                      const gfx::Font& font,
                      SkColor color,
                      int x, int y, int w, int h,
                      int flags);
 
   // Similar to above DrawStringInt method but with text shadows support.
-  // Currently it's only implemented for canvas skia.
+  // Currently it's only implemented for canvas skia. Specifying a 0 line_height
+  // will cause the default height to be used.
   void DrawStringWithShadows(const string16& text,
                              const gfx::Font& font,
                              SkColor color,
                              const gfx::Rect& text_bounds,
+                             int line_height,
                              int flags,
                              const ShadowValues& shadows);
 
   // Draws a dotted gray rectangle used for focus purposes.
   void DrawFocusRect(const gfx::Rect& rect);
 
   // Tiles the image in the specified region.
   // Parameters are specified relative to current canvas scale not in pixels.
   // Thus, |x| is 2 pixels if canvas scale = 2 & |x| = 1.
   void TileImageInt(const gfx::ImageSkia& image,
@@ skipping 59 matching lines @@
 
   skia::RefPtr<skia::PlatformCanvas> owned_canvas_;
   SkCanvas* canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(Canvas);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_CANVAS_H_