Renames gfx::FontList::Derive* family.

ui/app_list/views/speech_view.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/app_list/views/speech_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/shadow_border.h"
 
 namespace app_list {
 
 namespace {
 
 const int kShadowOffset = 1;
 const int kShadowBlur = 4;
 const int kSpeechViewMaxHeight = 300;
-const int kTextSize = 20;
 const int kMicButtonMargin = 12;
 const int kTextMargin = 32;
 const int kIndicatorRadiusMax = 100;
 const int kIndicatorAnimationDuration = 100;
 const SkColor kShadowColor = SkColorSetARGB(0.3 * 255, 0, 0, 0);
 const SkColor kHintTextColor = SkColorSetRGB(119, 119, 119);
 const SkColor kResultTextColor = SkColorSetRGB(178, 178, 178);
 const SkColor kSoundLevelIndicatorColor = SkColorSetRGB(219, 219, 219);
 
 class SoundLevelIndicator : public views::View {
@@ skipping 68 matching lines @@
 
   // TODO(mukai): add Google logo.
   indicator_ = new SoundLevelIndicator();
   indicator_->SetVisible(false);
   container->AddChildView(indicator_);
 
   mic_button_ = new MicButton(this);
   container->AddChildView(mic_button_);
 
   // TODO(mukai): use BoundedLabel to cap 2 lines.
-  speech_result_ = new views::Label();
+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  speech_result_ = new views::Label(
+      base::string16(), bundle.GetFontList(ui::ResourceBundle::LargeFont));
   speech_result_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  const gfx::FontList& font_list = speech_result_->font_list();
-  speech_result_->SetFontList(font_list.DeriveFontListWithSize(kTextSize));
+
   speech_result_->SetMultiLine(true);
   container->AddChildView(speech_result_);
 
   AddChildView(container);
 
   delegate_->GetSpeechUI()->AddObserver(this);
   indicator_animator_.reset(new views::BoundsAnimator(container));
   indicator_animator_->SetAnimationDuration(kIndicatorAnimationDuration);
   indicator_animator_->set_tween_type(gfx::Tween::LINEAR);
 
   Reset();
 }
 
 SpeechView::~SpeechView() {
   delegate_->GetSpeechUI()->RemoveObserver(this);
 }
 
 void SpeechView::Reset() {
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   speech_result_->SetText(l10n_util::GetStringUTF16(
       IDS_APP_LIST_SPEECH_HINT_TEXT));
   speech_result_->SetEnabledColor(kHintTextColor);
-  mic_button_->SetImage(views::Button::STATE_NORMAL, bundle.GetImageSkiaNamed(
-      IDR_APP_LIST_SPEECH_MIC_ON));
+  mic_button_->SetImage(views::Button::STATE_NORMAL,
+                        bundle.GetImageSkiaNamed(IDR_APP_LIST_SPEECH_MIC_ON));
 }
 
 int SpeechView::GetIndicatorRadius(uint8 level) {
   int radius_min = mic_button_->width() / 2;
   int range = kIndicatorRadiusMax - radius_min;
   return level * range / kuint8max + radius_min;
 }
 
 void SpeechView::Layout() {
   views::View* container = child_at(0);
@@ skipping 51 matching lines @@
 
 void SpeechView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   int resource_id = IDR_APP_LIST_SPEECH_MIC_OFF;
   if (new_state == SPEECH_RECOGNITION_ON)
     resource_id = IDR_APP_LIST_SPEECH_MIC_ON;
   else if (new_state == SPEECH_RECOGNITION_IN_SPEECH)
     resource_id = IDR_APP_LIST_SPEECH_MIC_RECORDING;
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  mic_button_->SetImage(views::Button::STATE_NORMAL, bundle.GetImageSkiaNamed(
-      resource_id));
+  mic_button_->SetImage(views::Button::STATE_NORMAL,
+                        bundle.GetImageSkiaNamed(resource_id));
 }
 
 }  // namespace app_list