diff options
| author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-11 08:02:43 +0000 |
|---|---|---|
| committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-11 08:02:43 +0000 |
| commit | 4630db4630bc415cc3b7be70bce87160559810df (patch) | |
| tree | 993f8eef59c10974d606f4599aefd4fffee705a8 | |
| parent | cc91bcb9b9d9fb0c5eb38a8da54b76f3fcad4a51 (diff) | |
| download | chromium_src-4630db4630bc415cc3b7be70bce87160559810df.zip chromium_src-4630db4630bc415cc3b7be70bce87160559810df.tar.gz chromium_src-4630db4630bc415cc3b7be70bce87160559810df.tar.bz2 | |
Fix chrome os build break caused by passing string16 where a wstring was expected.
TBR=vandebo
BUG=none
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59187 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/speech/speech_input_bubble_views.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 0be6378..a3dd616 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -7,6 +7,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -99,7 +100,7 @@ void ContentView::UpdateLayout(SpeechInputBubbleBase::DisplayMode mode, try_again_->SetVisible(is_message); if (mode == SpeechInputBubbleBase::DISPLAY_MODE_MESSAGE) { - message_->SetText(message_text); + message_->SetText(UTF16ToWideHack(message_text)); } else { icon_->SetImage(*ResourceBundle::GetSharedInstance().GetBitmapNamed( (mode == SpeechInputBubbleBase::DISPLAY_MODE_RECORDING) ? |