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

ui/message_center/views/bounded_label.cc

 // Copyright 2013 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/message_center/views/bounded_label.h"
 
 #include <limits>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 95 matching lines @@
     return gfx::Size();
   std::pair<int, int> key(width, lines);
   gfx::Size size = GetCachedSize(key);
   if (size.height() == std::numeric_limits<int>::max()) {
     gfx::Insets insets = owner_->GetInsets();
     int text_width = (width < 0) ? std::numeric_limits<int>::max() :
                                    std::max(width - insets.width(), 0);
     int text_height = std::numeric_limits<int>::max();
     std::vector<string16> wrapped = GetWrappedText(text_width, lines);
     gfx::Canvas::SizeStringInt(JoinString(wrapped, '\n'), font(),
-                               &text_width, &text_height, GetTextFlags());
+                               &text_width, &text_height,
+                               owner_->GetLineHeight(),
+                               GetTextFlags());
     size.set_width(text_width + insets.width());
     size.set_height(text_height + insets.height());
     SetCachedSize(key, size);
   }
   return size;
 }
 
 std::vector<string16> InnerBoundedLabel::GetWrappedText(int width, int lines) {
   // Short circuit simple case.
   if (width == 0 || lines == 0)
@@ skipping 33 matching lines @@
 
 void InnerBoundedLabel::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   ClearCaches();
   views::Label::OnBoundsChanged(previous_bounds);
 }
 
 void InnerBoundedLabel::OnPaint(gfx::Canvas* canvas) {
   views::Label::OnPaintBackground(canvas);
   views::Label::OnPaintFocusBorder(canvas);
   views::Label::OnPaintBorder(canvas);
-  int lines = owner_->line_limit();
+  int lines = owner_->GetLineLimit();
   int height = GetSizeForWidthAndLines(width(), lines).height();
   if (height > 0) {
     gfx::Rect bounds(width(), height);
     bounds.Inset(owner_->GetInsets());
     if (bounds.width() != wrapped_text_width_ || lines != wrapped_text_lines_) {
       wrapped_text_ = JoinString(GetWrappedText(bounds.width(), lines), '\n');
       wrapped_text_width_ = bounds.width();
       wrapped_text_lines_ = lines;
     }
     PaintText(canvas, wrapped_text_, bounds, GetTextFlags());
@@ skipping 87 matching lines @@
 }
 
 BoundedLabel::~BoundedLabel() {
 }
 
 void BoundedLabel::SetColors(SkColor textColor, SkColor backgroundColor) {
   label_->SetEnabledColor(textColor);
   label_->SetBackgroundColor(backgroundColor);
 }
 
+void BoundedLabel::SetLineHeight(int height) {
+  label_->SetLineHeight(height);
+}
+
 void BoundedLabel::SetLineLimit(int lines) {
   line_limit_ = std::max(lines, -1);
 }
 
+int BoundedLabel::GetLineHeight() const {
+  return label_->line_height();
+}
+
+int BoundedLabel::GetLineLimit() const {
+  return line_limit_;
+}
+
 int BoundedLabel::GetLinesForWidthAndLimit(int width, int limit) {
   return visible() ? label_->GetLinesForWidthAndLimit(width, limit) : 0;
 }
 
 gfx::Size BoundedLabel::GetSizeForWidthAndLines(int width, int lines) {
   return visible() ?
          label_->GetSizeForWidthAndLines(width, lines) : gfx::Size();
 }
 
 int BoundedLabel::GetBaseline() const {
@@ skipping 29 matching lines @@
 
 void BoundedLabel::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   label_->SetNativeTheme(theme);
 }
 
 string16 BoundedLabel::GetWrappedTextForTest(int width, int lines) {
   return JoinString(label_->GetWrappedText(width, lines), '\n');
 }
 
 }  // namespace message_center