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

ui/gfx/canvas.cc

 // 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.
 
 #include "ui/gfx/canvas.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 71 matching lines @@
                                                             pixel_size.height(),
                                                             is_opaque));
   canvas_ = owned_canvas_.get();
   SkScalar scale = SkFloatToScalar(ui::GetScaleFactorScale(scale_factor_));
   canvas_->scale(scale, scale);
 }
 
 // static
 int Canvas::GetStringWidth(const string16& text, const gfx::Font& font) {
   int width = 0, height = 0;
-  Canvas::SizeStringInt(text, font, &width, &height, NO_ELLIPSIS);
+  Canvas::SizeStringInt(text, font, &width, &height, 0, NO_ELLIPSIS);
   return width;
 }
 
 // static
 int Canvas::DefaultCanvasTextAlignment() {
   return base::i18n::IsRTL() ? TEXT_ALIGN_RIGHT : TEXT_ALIGN_LEFT;
 }
 
 gfx::ImageSkiaRep Canvas::ExtractImageRep() const {
   const SkBitmap& device_bitmap = canvas_->getDevice()->accessBitmap(false);
@@ skipping 323 matching lines @@
 
 void Canvas::DrawStringInt(const string16& text,
                            const gfx::Font& font,
                            SkColor color,
                            int x, int y, int w, int h,
                            int flags) {
   DrawStringWithShadows(text,
                         font,
                         color,
                         gfx::Rect(x, y, w, h),
+                        0,
                         flags,
                         ShadowValues());
 }
 
 void Canvas::TileImageInt(const gfx::ImageSkia& image,
                           int x, int y, int w, int h) {
   TileImageInt(image, 0, 0, x, y, w, h);
 }
 
 void Canvas::TileImageInt(const gfx::ImageSkia& image,
@@ skipping 87 matching lines @@
 
     float bitmap_scale = image_rep.GetScale();
     if (scale_x < bitmap_scale || scale_y < bitmap_scale)
       const_cast<SkBitmap&>(image_rep.sk_bitmap()).buildMipMap();
   }
 
   return image_rep;
 }
 
 }  // namespace gfx