Chromium Code Reviews| Index: ui/app_list/views/speech_view.cc |
| diff --git a/ui/app_list/views/speech_view.cc b/ui/app_list/views/speech_view.cc |
| index 7f59222d4c3725aa5e5cc88de1c8b970c7e52cbb..8eb05e32633d041343d139186de7ce385be8344f 100644 |
| --- a/ui/app_list/views/speech_view.cc |
| +++ b/ui/app_list/views/speech_view.cc |
| @@ -27,7 +27,6 @@ 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; |
| @@ -116,10 +115,11 @@ SpeechView::SpeechView(AppListViewDelegate* delegate) |
| container->AddChildView(mic_button_); |
| // TODO(mukai): use BoundedLabel to cap 2 lines. |
| - speech_result_ = new views::Label(); |
| + ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); |
|
Alexei Svitkine (slow)
2014/01/20 15:38:10
Nit: Non-const refs are discouraged (even though I
Yuki
2014/01/23 15:24:19
Done.
|
| + 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_); |