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

ui/message_center/views/notification_view.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/message_center/views/notification_view.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 394 matching lines @@
                            kRegularTextBackgroundColor);
     title_view_->set_border(MakeTextBorder(3, 0));
     top_view_->AddChildView(title_view_);
   }
 
   // Create the message view if appropriate.
   message_view_ = NULL;
   if (!notification.message().empty()) {
     message_view_ = new BoundedLabel(
         ui::TruncateString(notification.message(), kMessageCharacterLimit));
+    message_view_->SetLineHeight(kMessageLineHeight);
     message_view_->SetVisible(!is_expanded() || !notification.items().size());
     message_view_->SetColors(kDimTextColor, kDimTextBackgroundColor);
     message_view_->set_border(MakeTextBorder(4, 1));
     top_view_->AddChildView(message_view_);
   }
 
   // Create the list item views (up to a maximum).
   std::vector<NotificationItem> items = notification.items();
   for (size_t i = 0; i < items.size() && i < kNotificationMaximumItems; ++i) {
     ItemView* item_view = new ItemView(items[i]);
@@ skipping 75 matching lines @@
   int content_width = width - GetInsets().width();
   int top_height = top_view_->GetHeightForWidth(content_width);
   int bottom_height = bottom_view_->GetHeightForWidth(content_width);
   int total_height = std::max(top_height, kIconSize) +
                      bottom_height + GetInsets().height();
 
   // Fix for http://crbug.com/230448: Adjust the height when the message_view's
   // line limit would be different for the specified width than it currently is.
   // TODO(dharcourt): Avoid BoxLayout and directly compute the correct height.
   if (message_view_ && title_view_) {
-    int used_limit = message_view_->line_limit();
+    int used_limit = message_view_->GetLineLimit();
     int correct_limit = GetMessageLineLimit(width);
     if (used_limit != correct_limit) {
       total_height -= GetMessageHeight(content_width, used_limit);
       total_height += GetMessageHeight(content_width, correct_limit);
     }
   }
 
   return total_height;
 }
 
@@ skipping 102 matching lines @@
   return message_view_ ?
          message_view_->GetLinesForWidthAndLimit(width, limit) : 0;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
 }  // namespace message_center