Clean-up: Replaces obsolete Font/FontList methods.

ash/ime/candidate_view.cc

 // Copyright 2014 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/ime/candidate_view.h"
 
 #include "ash/ime/candidate_window_constants.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/candidate_window.h"
 #include "ui/gfx/color_utils.h"
@@ skipping 34 matching lines @@
 views::Label* CreateShortcutLabel(
     ui::CandidateWindow::Orientation orientation,
     const ui::NativeTheme& theme) {
   // Create the shortcut label. The label will be owned by
   // |wrapped_shortcut_label|, hence it's deleted when
   // |wrapped_shortcut_label| is deleted.
   views::Label* shortcut_label = new views::Label;
 
   if (orientation == ui::CandidateWindow::VERTICAL) {
     shortcut_label->SetFontList(
-        shortcut_label->font_list().DeriveFontListWithSizeDeltaAndStyle(
-            kFontSizeDelta, gfx::Font::BOLD));
+        shortcut_label->font_list().Derive(kFontSizeDelta, gfx::Font::BOLD));
   } else {
     shortcut_label->SetFontList(
-        shortcut_label->font_list().DeriveFontListWithSizeDelta(
-            kFontSizeDelta));
+        shortcut_label->font_list().DeriveWithSizeDelta(kFontSizeDelta));
   }
   // TODO(satorux): Maybe we need to use language specific fonts for
   // candidate_label, like Chinese font for Chinese input method?
   shortcut_label->SetEnabledColor(theme.GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
   shortcut_label->SetDisabledColor(theme.GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor));
 
   // Setup paddings.
   const gfx::Insets kVerticalShortcutLabelInsets(1, 6, 1, 6);
@@ skipping 30 matching lines @@
   // Create the candidate label. The label will be added to |this| as a
   // child view, hence it's deleted when |this| is deleted.
   if (orientation == ui::CandidateWindow::VERTICAL) {
     candidate_label = new VerticalCandidateLabel;
   } else {
     candidate_label = new views::Label;
   }
 
   // Change the font size.
   candidate_label->SetFontList(
-      candidate_label->font_list().DeriveFontListWithSizeDelta(kFontSizeDelta));
+      candidate_label->font_list().DeriveWithSizeDelta(kFontSizeDelta));
   candidate_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   return candidate_label;
 }
 
 // Creates the annotation label, and return it (never returns NULL).
 // The label text is not set in this function.
 views::Label* CreateAnnotationLabel(
     ui::CandidateWindow::Orientation orientation,
     const ui::NativeTheme& theme) {
   // Create the annotation label.
   views::Label* annotation_label = new views::Label;
 
   // Change the font size and color.
   annotation_label->SetFontList(
-      annotation_label->font_list().DeriveFontListWithSizeDelta(
-          kFontSizeDelta));
+      annotation_label->font_list().DeriveWithSizeDelta(kFontSizeDelta));
   annotation_label->SetEnabledColor(theme.GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor));
   annotation_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   return annotation_label;
 }
 
 }  // namespace
 
 CandidateView::CandidateView(
@@ skipping 141 matching lines @@
   }
 
   // Reserves the margin for infolist_icon even if it's not visible.
   size.Enlarge(
       kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0);
   return size;
 }
 
 }  // namespace ime
 }  // namespace ash