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

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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 125 matching lines @@
     height = (lines + 1) * line_height;
   }
 
   // Try to ensure that the width is no smaller than the width of the text's
   // characters to avoid the http://crbug.com/237700 infinite loop.
   // TODO(dharcourt): Remove when http://crbug.com/237700 is fixed.
   width = std::max(width, 2 * font().GetStringWidth(UTF8ToUTF16("W")));
 
   // Wrap, using INT_MAX for -1 widths that indicate no wrapping.
   std::vector<string16> wrapped;
-  gfx::ElideRectangleText(text(), font(),
-                         (width < 0) ? std::numeric_limits<int>::max() : width,
-                         height, gfx::WRAP_LONG_WORDS, &wrapped);
+  gfx::ElideRectangleText(text(), font_list(),
+                          (width < 0) ? std::numeric_limits<int>::max() : width,
+                          height, gfx::WRAP_LONG_WORDS, &wrapped);
 
   // Elide if necessary.
   if (lines > 0 && wrapped.size() > static_cast<unsigned int>(lines)) {
     // Add an ellipsis to the last line. If this ellipsis makes the last line
     // too wide, that line will be further elided by the gfx::ElideText below,
     // so for example "ABC" could become "ABC..." and then "AB...".
     string16 last = wrapped[lines - 1] + UTF8ToUTF16(gfx::kEllipsis);
     if (width > 0 && font().GetStringWidth(last) > width)
       last = gfx::ElideText(last, font(), width, gfx::ELIDE_AT_END);
     wrapped.resize(lines - 1);
@@ skipping 93 matching lines @@
   if (size_cache_.size() >= kPreferredLinesCacheSize) {
     size_cache_.erase(size_widths_and_lines_.back());
     size_widths_and_lines_.pop_back();
   }
   size_cache_[width_and_lines] = size;
   size_widths_and_lines_.push_front(width_and_lines);
 }
 
 // BoundedLabel ///////////////////////////////////////////////////////////
 
-BoundedLabel::BoundedLabel(const string16& text, gfx::Font font)
+BoundedLabel::BoundedLabel(const string16& text, const gfx::FontList& font_list)
     : line_limit_(-1) {
   label_.reset(new InnerBoundedLabel(*this));
-  label_->SetFont(font);
+  label_->SetFontList(font_list);
   label_->SetText(text);
 }
 
 BoundedLabel::BoundedLabel(const string16& text)
     : line_limit_(-1) {
   label_.reset(new InnerBoundedLabel(*this));
   label_->SetText(text);
 }
 
 BoundedLabel::~BoundedLabel() {
@@ skipping 62 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