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

chrome/browser/ui/views/default_search_view.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/ui/views/default_search_view.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 41 matching lines @@
     *short_name = built_in_data->short_name();
     *logo_id = built_in_data->logo_id();
   } else {
     *short_name = UTF8ToWide(url.host()).c_str();
     *logo_id = kNoSearchEngineLogo;
   }
 }
 
 views::Label* CreateProviderLabel(int message_id) {
   views::Label* choice_label =
-      new views::Label(l10n_util::GetStringUTF16(message_id));
+      new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(message_id)));
   choice_label->SetColor(SK_ColorBLACK);
   choice_label->SetFont(
       choice_label->font().DeriveFont(1, gfx::Font::NORMAL));
   return choice_label;
 }
 
 views::View* CreateProviderLogo(
     int logo_id,
     const std::wstring& short_name) {
   views::View* logo_view = NULL;
@@ skipping 199 matching lines @@
   background_image_->SetImage(rb.GetBitmapNamed(IDR_SEARCH_ENGINE_DIALOG_TOP));
   background_image_->EnableCanvasFlippingForRTLUI(true);
   ImageView::Alignment horizontal_alignment =
       base::i18n::IsRTL() ? ImageView::LEADING : ImageView::TRAILING;
   background_image_->SetHorizontalAlignment(horizontal_alignment);
   layout->AddView(background_image_);
 
   // Add text informing the user about the requested default change.
   layout->StartRowWithPadding(0, kPaddedWholeDialogViewSetId,
                               1, views::kLabelToControlVerticalSpacing);
-  Label* summary_label = new Label(l10n_util::GetStringFUTF16(
+  Label* summary_label = new Label(UTF16ToWide(l10n_util::GetStringFUTF16(
       IDS_DEFAULT_SEARCH_SUMMARY,
-      WideToUTF16(proposed_short_name)));
+      WideToUTF16(proposed_short_name))));
   summary_label->SetColor(SK_ColorBLACK);
   summary_label->SetFont(
       summary_label->font().DeriveFont(1, gfx::Font::NORMAL));
   summary_label->SetHorizontalAlignment(Label::ALIGN_LEFT);
   layout->AddView(summary_label);
 
   // Add the labels for the tops of the choices.
   layout->StartRowWithPadding(0, kChoicesViewSetId,
                               0, views::kRelatedControlVerticalSpacing);
   layout->AddView(CreateProviderLabel(IDS_DEFAULT_SEARCH_LABEL_CURRENT));
@@ skipping 12 matching lines @@
       this,
       IDS_DEFAULT_SEARCH_PROMPT_CURRENT,
       default_short_name);
   layout->AddView(default_provider_button_);
   proposed_provider_button_ = CreateProviderChoiceButton(
       this,
       IDS_DEFAULT_SEARCH_PROMPT_PROPOSED,
       proposed_short_name);
   layout->AddView(proposed_provider_button_);
 }