Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/speech/speech_input_bubble_views.cc

 // Copyright (c) 2011 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 "chrome/browser/speech/speech_input_bubble.h"
 
 #include <algorithm>
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 65 matching lines @@
 
 ContentView::ContentView(SpeechInputBubbleDelegate* delegate)
      : delegate_(delegate),
        display_mode_(SpeechInputBubbleBase::DISPLAY_MODE_WARM_UP),
        kIconLayoutMinWidth(ResourceBundle::GetSharedInstance().GetBitmapNamed(
                            IDR_SPEECH_INPUT_MIC_EMPTY)->width()) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& font = rb.GetFont(ResourceBundle::MediumFont);
 
   heading_ = new views::Label(
-      l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING)));
   heading_->set_border(views::Border::CreateEmptyBorder(
       kBubbleHeadingVertMargin, 0, kBubbleHeadingVertMargin, 0));
   heading_->SetFont(font);
   heading_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
-  heading_->SetText(
-      l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING));
+  heading_->SetText(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING)));
   AddChildView(heading_);
 
   message_ = new views::Label();
   message_->SetFont(font);
   message_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
   message_->SetMultiLine(true);
   AddChildView(message_);
 
   icon_ = new views::ImageView();
   icon_->SetHorizontalAlignment(views::ImageView::CENTER);
   AddChildView(icon_);
 
   cancel_ = new views::NativeTextButton(
       this,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_CANCEL)));
   AddChildView(cancel_);
 
   try_again_ = new views::NativeTextButton(
       this,
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_TRY_AGAIN)));
   AddChildView(try_again_);
 
   mic_settings_ = new views::Link(
-      l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_MIC_SETTINGS));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_MIC_SETTINGS)));
   mic_settings_->set_listener(this);
   AddChildView(mic_settings_);
 }
 
 void ContentView::UpdateLayout(SpeechInputBubbleBase::DisplayMode mode,
                                const string16& message_text,
                                const SkBitmap& image) {
   display_mode_ = mode;
   bool is_message = (mode == SpeechInputBubbleBase::DISPLAY_MODE_MESSAGE);
   icon_->SetVisible(!is_message);
   message_->SetVisible(is_message);
   mic_settings_->SetVisible(is_message);
   try_again_->SetVisible(is_message);
   cancel_->SetVisible(mode != SpeechInputBubbleBase::DISPLAY_MODE_WARM_UP);
   heading_->SetVisible(mode == SpeechInputBubbleBase::DISPLAY_MODE_RECORDING);
 
   if (is_message) {
-    message_->SetText(message_text);
+    message_->SetText(UTF16ToWideHack(message_text));
   } else {
     SetImage(image);
   }
 
   if (icon_->IsVisible())
     icon_->ResetImageSize();
 
   // When moving from warming up to recording state, the size of the content
   // stays the same. So we wouldn't get a resize/layout call from the view
   // system and we do it ourselves.
@@ skipping 250 matching lines @@
 }
 
 }  // namespace
 
 SpeechInputBubble* SpeechInputBubble::CreateNativeBubble(
     TabContents* tab_contents,
     SpeechInputBubble::Delegate* delegate,
     const gfx::Rect& element_rect) {
   return new SpeechInputBubbleImpl(tab_contents, delegate, element_rect);
 }