Renames gfx::FontList::Derive* family.

ash/ime/infolist_window.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/infolist_window.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ime/candidate_window_constants.h"
 #include "base/logging.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/color_utils.h"
-#include "ui/gfx/font.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/corewm/window_animations.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 54 matching lines @@
   // window without the gap.
   return gfx::Insets();
 }
 
 }  // namespace
 
 // InfolistRow renderes a row of a infolist.
 class InfolistEntryView : public views::View {
  public:
   InfolistEntryView(const ui::InfolistEntry& entry,
-                    const gfx::FontList& title_font,
-                    const gfx::FontList& description_font);
+                    const gfx::FontList& title_font_list,
+                    const gfx::FontList& description_font_list);
   virtual ~InfolistEntryView();
 
   void SetEntry(const ui::InfolistEntry& entry);
 
  private:
   // views::View implementation.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   void UpdateBackground();
 
   ui::InfolistEntry entry_;
 
   // The title label. Owned by views hierarchy.
   views::Label* title_label_;
 
   // The description label. Owned by views hierarchy.
   views::Label* description_label_;
 
   DISALLOW_COPY_AND_ASSIGN(InfolistEntryView);
 };
 
 InfolistEntryView::InfolistEntryView(const ui::InfolistEntry& entry,
-                                     const gfx::FontList& title_font,
-                                     const gfx::FontList& description_font)
+                                     const gfx::FontList& title_font_list,
+                                     const gfx::FontList& description_font_list)
     : entry_(entry) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 
-  title_label_ = new views::Label(entry.title);
+  title_label_ = new views::Label(entry.title, title_font_list);
   title_label_->SetPosition(gfx::Point(0, 0));
-  title_label_->SetFontList(title_font);
   title_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   title_label_->set_border(
       views::Border::CreateEmptyBorder(4, 7, 2, 4));
 
-  description_label_ = new views::Label(entry.body);
+  description_label_ = new views::Label(entry.body, description_font_list);
   description_label_->SetPosition(gfx::Point(0, 0));
-  description_label_->SetFontList(description_font);
   description_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   description_label_->SetMultiLine(true);
   description_label_->SizeToFit(kInfolistEntryWidth);
   description_label_->set_border(
       views::Border::CreateEmptyBorder(2, 17, 4, 4));
   AddChildView(title_label_);
   AddChildView(description_label_);
   UpdateBackground();
 }
 
@@ skipping 27 matching lines @@
   }
   SchedulePaint();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // InfolistWindow
 
 InfolistWindow::InfolistWindow(views::View* candidate_window,
                                const std::vector<ui::InfolistEntry>& entries)
     : views::BubbleDelegateView(candidate_window, views::BubbleBorder::NONE),
-      title_font_(gfx::Font(kJapaneseFontName, kFontSizeDelta + 15)),
-      description_font_(gfx::Font(kJapaneseFontName, kFontSizeDelta + 11)) {
+      title_font_list_(gfx::Font(kJapaneseFontName, kFontSizeDelta + 15)),

[Alexei Svitkine (slow), 2014/01/23 18:47:54]

I know your code isn't changing this, but I find these defaults pretty bizarre.
Any idea why Japanese font is used explicitly here (rather than getting the
current UI font)?

[Yuki, 2014/01/24 10:23:20]

Some people type Japanese text while using English UI.  In the case that the
Chrome's UI language is English and a user wants to type Japanese, the current
UI font list doesn't include any Japanese font.  I think this is the reason.  I
agree that this shouldn't be this way.

+      description_font_list_(gfx::Font(kJapaneseFontName,
+                                       kFontSizeDelta + 11)) {
   set_move_with_anchor(true);
   set_margins(gfx::Insets());
 
   set_background(
       views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_WindowBackground)));
   set_border(
       views::Border::CreateSolidBorder(1, GetNativeTheme()->GetSystemColor(
           ui::NativeTheme::kColorId_MenuBorderColor)));
 
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 
   views::Label* caption_label = new views::Label(
       l10n_util::GetStringUTF16(IDS_ASH_IME_INFOLIST_WINDOW_TITLE));
-  caption_label->SetFontList(
-      caption_label->font_list().DeriveFontList(kFontSizeDelta - 2));
   caption_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   caption_label->SetEnabledColor(GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
   caption_label->set_border(views::Border::CreateEmptyBorder(2, 2, 2, 2));
   caption_label->set_background(views::Background::CreateSolidBackground(
       color_utils::AlphaBlend(SK_ColorBLACK,
                               GetNativeTheme()->GetSystemColor(
                                   ui::NativeTheme::kColorId_WindowBackground),
                               0x10)));
 
   AddChildView(caption_label);
 
   for (size_t i = 0; i < entries.size(); ++i) {
-    entry_views_.push_back(
-        new InfolistEntryView(entries[i], title_font_, description_font_));
+    entry_views_.push_back(new InfolistEntryView(
+        entries[i], title_font_list_, description_font_list_));
     AddChildView(entry_views_.back());
   }
 }
 
 InfolistWindow::~InfolistWindow() {
 }
 
 void InfolistWindow::InitWidget() {
   views::Widget* widget = views::BubbleDelegateView::CreateBubble(this);
   views::corewm::SetWindowVisibilityAnimationType(
       widget->GetNativeView(),
       views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
 
   // BubbleFrameView will be initialized through CreateBubble.
   GetBubbleFrameView()->SetBubbleBorder(new InfolistBorder());
   SizeToContents();
 }
 
 void InfolistWindow::Relayout(const std::vector<ui::InfolistEntry>& entries) {
   size_t i = 0;
   for (; i < entries.size(); ++i) {
     if (i < entry_views_.size()) {
       entry_views_[i]->SetEntry(entries[i]);
     } else {
       InfolistEntryView* new_entry = new InfolistEntryView(
-          entries[i], title_font_, description_font_);
+          entries[i], title_font_list_, description_font_list_);
       AddChildView(new_entry);
       entry_views_.push_back(new_entry);
     }
   }
 
   if (i < entry_views_.size()) {
     for (; i < entry_views_.size(); ++i)
       delete entry_views_[i];
     entry_views_.resize(entries.size());
   }
@@ skipping 28 matching lines @@
   show_hide_timer_.Stop();
   GetWidget()->Close();
 }
 
 void InfolistWindow::WindowClosing() {
   show_hide_timer_.Stop();
 }
 
 }  // namespace ime
 }  // namespace ash