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

ui/gfx/canvas_android.cc

Index: ui/gfx/canvas_android.cc
diff --git a/ui/gfx/canvas_android.cc b/ui/gfx/canvas_android.cc
index 73ddee8db6bc069427cdb7ceccd14d0b4c12f71b..b56304384349a98f198b3af567354a7fbb65d3e1 100644
--- a/ui/gfx/canvas_android.cc
+++ b/ui/gfx/canvas_android.cc
@@ -12,7 +12,9 @@ namespace gfx {
 // static
 void Canvas::SizeStringInt(const string16& text,
                            const gfx::Font& font,
-                           int* width, int* height, int flags) {
+                           int* width, int* height,

[msw, 2013/04/17 20:12:59]

nit: split args onto individual lines while you're here.

[dharcourt, 2013/04/17 23:29:40]

Done.

+                           int line_height,
+                           int flags) {
   NOTIMPLEMENTED();
 }
 
@@ -20,6 +22,7 @@ void Canvas::DrawStringWithShadows(const string16& text,
                                    const gfx::Font& font,
                                    SkColor color,
                                    const gfx::Rect& text_bounds,
+                                   int line_height,
                                    int flags,
                                    const ShadowValues& shadows) {
   NOTIMPLEMENTED();