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

ui/views/view_text_utils.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/views/view_text_utils.h"
 
 #include "base/i18n/bidi_line_iterator.h"
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 93 matching lines @@
   // iterate to the next line breaking opportunity.
   while (iter.Advance()) {
     // Get the word and figure out the dimensions.
     string16 word;
     if (!ltr_within_rtl)
       word = iter.GetString();  // Get the next word.
     else
       word = text;  // Draw the whole text at once.
 
     int w = 0, h = 0;
-    gfx::Canvas::SizeStringInt(word, font, &w, &h, flags);
+    gfx::Canvas::SizeStringInt(word, font, &w, &h, 0, flags);
 
     // If we exceed the boundaries, we need to wrap.
     WrapIfWordDoesntFit(w, font.GetHeight(), position, bounds);
 
     int x = label->GetMirroredXInView(position->width()) + bounds.x();
     if (text_direction_is_rtl) {
       x -= w;
       // When drawing LTR strings inside RTL text we need to make sure we
       // draw the trailing space (if one exists after the LTR text) to the
       // left of the LTR string.
@@ skipping 24 matching lines @@
                          int font_height,
                          gfx::Size* position,
                          const gfx::Rect& bounds) {
   if (position->width() + word_width > bounds.right()) {
     position->set_width(0);
     position->Enlarge(0, font_height);
   }
 }
 
 }  // namespace view_text_utils