Clean-up: Replaces Font with FontList in ui/message_center.

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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 448 matching lines @@
 
   // Create the top_view_, which collects into a vertical box all content
   // at the top of the notification (to the right of the icon) except for the
   // close button.
   top_view_ = new views::View();
   top_view_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   top_view_->set_border(MakeEmptyBorder(
       kTextTopPadding - 8, 0, kTextBottomPadding - 5, 0));
 
+  const gfx::FontList default_label_font_list = views::Label().font_list();
+
   // Create the title view if appropriate.
   title_view_ = NULL;
   if (!notification.title().empty()) {
-    gfx::Font font = views::Label().font().DeriveFont(2);
-    int padding = kTitleLineHeight - font.GetHeight();
+    const gfx::FontList& font_list =
+        default_label_font_list.DeriveFontListWithSizeDelta(2);
+    int padding = kTitleLineHeight - font_list.GetHeight();
     title_view_ = new BoundedLabel(
-        gfx::TruncateString(notification.title(), kTitleCharacterLimit), font);
+        gfx::TruncateString(notification.title(), kTitleCharacterLimit),
+        font_list);
     title_view_->SetLineHeight(kTitleLineHeight);
     title_view_->SetLineLimit(message_center::kTitleLineLimit);
     title_view_->SetColors(message_center::kRegularTextColor,
                            kRegularTextBackgroundColor);
     title_view_->set_border(MakeTextBorder(padding, 3, 0));
     top_view_->AddChildView(title_view_);
     accessible_lines.push_back(notification.title());
   }
 
   // Create the message view if appropriate.
   message_view_ = NULL;
   if (!notification.message().empty()) {
-    int padding = kMessageLineHeight - views::Label().font().GetHeight();
+    int padding = kMessageLineHeight - default_label_font_list.GetHeight();
     message_view_ = new BoundedLabel(
         gfx::TruncateString(notification.message(), kMessageCharacterLimit));
     message_view_->SetLineHeight(kMessageLineHeight);
     message_view_->SetVisible(!is_expanded() || !notification.items().size());
     message_view_->SetColors(message_center::kRegularTextColor,
                              kDimTextBackgroundColor);
     message_view_->set_border(MakeTextBorder(padding, 4, 0));
     top_view_->AddChildView(message_view_);
     accessible_lines.push_back(notification.message());
   }
 
   // Create the context message view if appropriate.
   context_message_view_ = NULL;
   if (!notification.context_message().empty()) {
-    gfx::Font font = views::Label().font();
-    int padding = kMessageLineHeight - font.GetHeight();
+    int padding = kMessageLineHeight - default_label_font_list.GetHeight();
     context_message_view_ =
         new BoundedLabel(gfx::TruncateString(notification.context_message(),
                                             kContextMessageCharacterLimit),
-                         font);
+                         default_label_font_list);
     context_message_view_->SetLineLimit(
         message_center::kContextMessageLineLimit);
     context_message_view_->SetLineHeight(kMessageLineHeight);
     context_message_view_->SetColors(message_center::kDimTextColor,
                                      kContextTextBackgroundColor);
     context_message_view_->set_border(MakeTextBorder(padding, 4, 0));
     top_view_->AddChildView(context_message_view_);
     accessible_lines.push_back(notification.context_message());
   }
 
   // Create the progress bar view.
   progress_bar_view_ = NULL;
   if (notification.type() == NOTIFICATION_TYPE_PROGRESS) {
     progress_bar_view_ = new NotificationProgressBar();
     progress_bar_view_->set_border(MakeProgressBarBorder(
         message_center::kProgressBarTopPadding, kProgressBarBottomPadding));
     progress_bar_view_->SetValue(notification.progress() / 100.0);
     top_view_->AddChildView(progress_bar_view_);
   }
 
   // Create the list item views (up to a maximum).
-  int padding = kMessageLineHeight - views::Label().font().GetHeight();
+  int padding = kMessageLineHeight - default_label_font_list.GetHeight();
   std::vector<NotificationItem> items = notification.items();
   for (size_t i = 0; i < items.size() && i < kNotificationMaximumItems; ++i) {
     ItemView* item_view = new ItemView(items[i]);
     item_view->SetVisible(is_expanded());
     item_view->set_border(MakeTextBorder(padding, i ? 0 : 4, 0));
     item_views_.push_back(item_view);
     top_view_->AddChildView(item_view);
     accessible_lines.push_back(
         items[i].title + base::ASCIIToUTF16(" ") + items[i].message);
   }
@@ skipping 239 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