Clean-up: Replaces obsolete Font/FontList methods.

ash/system/tray/hover_highlight_view.cc

 // Copyright 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 "ash/system/tray/hover_highlight_view.h"
 
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/view_click_listener.h"
 #include "grit/ui_resources.h"
@@ skipping 38 matching lines @@
                                          gfx::Font::FontStyle style) {
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 3, kTrayPopupPaddingBetweenItems));
   views::ImageView* image_view =
       new FixedSizedImageView(kTrayPopupDetailsIconWidth, 0);
   image_view->SetImage(image);
   AddChildView(image_view);
 
   text_label_ = new views::Label(text);
   text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  text_label_->SetFontList(
-      text_label_->font_list().DeriveFontListWithSizeDeltaAndStyle(0, style));
+  text_label_->SetFontList(text_label_->font_list().DeriveWithStyle(style));
   if (text_default_color_)
     text_label_->SetEnabledColor(text_default_color_);
   AddChildView(text_label_);
 
   SetAccessibleName(text);
 }
 
 views::Label* HoverHighlightView::AddLabel(const base::string16& text,
                                            gfx::Font::FontStyle style) {
   SetLayoutManager(new views::FillLayout());
   text_label_ = new views::Label(text);
   int margin = kTrayPopupPaddingHorizontal +
       kTrayPopupDetailsLabelExtraLeftMargin;
   int left_margin = 0;
   int right_margin = 0;
   if (base::i18n::IsRTL())
     right_margin = margin;
   else
     left_margin = margin;
   text_label_->SetBorder(
       views::Border::CreateEmptyBorder(5, left_margin, 5, right_margin));
   text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  text_label_->SetFontList(
-      text_label_->font_list().DeriveFontListWithSizeDeltaAndStyle(0, style));
+  text_label_->SetFontList(text_label_->font_list().DeriveWithStyle(style));
   // Do not set alpha value in disable color. It will have issue with elide
   // blending filter in disabled state for rendering label text color.
   text_label_->SetDisabledColor(SkColorSetARGB(255, 127, 127, 127));
   if (text_default_color_)
     text_label_->SetEnabledColor(text_default_color_);
   AddChildView(text_label_);
 
   SetAccessibleName(text);
   return text_label_;
 }
@@ skipping 11 matching lines @@
         kTrayPopupDetailsLabelExtraLeftMargin - kCheckLabelPadding;
     SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal, 0, 3, kCheckLabelPadding));
     views::ImageView* image_view = new FixedSizedImageView(margin, 0);
     image_view->SetImage(check);
     image_view->SetHorizontalAlignment(views::ImageView::TRAILING);
     AddChildView(image_view);
 
     text_label_ = new views::Label(text);
     text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    text_label_->SetFontList(
-        text_label_->font_list().DeriveFontListWithSizeDeltaAndStyle(0, style));
+    text_label_->SetFontList(text_label_->font_list().DeriveWithStyle(style));
     text_label_->SetDisabledColor(SkColorSetARGB(127, 0, 0, 0));
     if (text_default_color_)
       text_label_->SetEnabledColor(text_default_color_);
     AddChildView(text_label_);
 
     SetAccessibleName(text);
     return text_label_;
   }
   return AddLabel(text, style);
 }
@@ skipping 55 matching lines @@
   canvas->DrawColor(hover_ ? highlight_color_ : default_color_);
 }
 
 void HoverHighlightView::OnFocus() {
   ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
   ActionableView::OnFocus();
 }
 
 }  // namespace internal
 }  // namespace ash