Make the app list speech view query able to span multiple lines.

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 "third_party/skia/include/core/SkPath.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
@@ skipping 120 matching lines @@
   container->AddChildView(indicator_);
 
   MicButton* mic_button = new MicButton(this);
   mic_button_ = mic_button;
   container->AddChildView(mic_button_);
   mic_button_->SetEventTargeter(
       scoped_ptr<views::ViewTargeter>(new views::ViewTargeter(mic_button)));
 
   // TODO(mukai): use BoundedLabel to cap 2 lines.
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  // TODO(calamity): make this label multiline once Label caches its RenderText.
-  // See http://crbug.com/450791.
   speech_result_ = new views::Label(
       base::string16(), bundle.GetFontList(ui::ResourceBundle::LargeFont));
+  speech_result_->SetMultiLine(true);
   speech_result_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   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);
@@ skipping 61 matching lines @@
   } else {
     indicator_->SetVisible(true);
     indicator_->SetBoundsRect(indicator_bounds);
   }
 }
 
 void SpeechView::OnSpeechResult(const base::string16& result,
                                 bool is_final) {
   speech_result_->SetText(result);
   speech_result_->SetEnabledColor(kResultTextColor);
+  Layout();
 }
 
 void SpeechView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   int resource_id = IDR_APP_LIST_SPEECH_MIC_OFF;
   if (new_state == SPEECH_RECOGNITION_RECOGNIZING)
     resource_id = IDR_APP_LIST_SPEECH_MIC_ON;
   else if (new_state == SPEECH_RECOGNITION_IN_SPEECH)
     resource_id = IDR_APP_LIST_SPEECH_MIC_RECORDING;
 
   int text_resource_id = IDS_APP_LIST_SPEECH_HINT_TEXT;
 
   if (new_state == SPEECH_RECOGNITION_NETWORK_ERROR) {
     text_resource_id = IDS_APP_LIST_SPEECH_NETWORK_ERROR_HINT_TEXT;
     indicator_->SetVisible(false);
   }
   speech_result_->SetText(l10n_util::GetStringUTF16(text_resource_id));
   speech_result_->SetEnabledColor(kHintTextColor);
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   mic_button_->SetImage(views::Button::STATE_NORMAL,
                         bundle.GetImageSkiaNamed(resource_id));
 }
 
 }  // namespace app_list