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

chrome/browser/chromeos/login/captcha_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/chromeos/login/captcha_view.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/image_downloader.h"
@@ skipping 152 matching lines @@
 
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
   int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, column_view_set_id);
   Label* label = new views::Label(
-      l10n_util::GetStringUTF16(IDS_LOGIN_CAPTCHA_INSTRUCTIONS));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_CAPTCHA_INSTRUCTIONS)));
   label->SetMultiLine(true);
   layout->AddView(label);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, column_view_set_id);
   captcha_image_ = new views::ImageView();
   layout->AddView(captcha_image_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, column_view_set_id);
   captcha_textfield_ = new CaptchaField();
   captcha_textfield_->SetController(this);
   if (is_standalone_)
     captcha_textfield_->set_background(new CopyBackground(this));
   layout->AddView(captcha_textfield_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, column_view_set_id);
-  label = new views::Label(
-      l10n_util::GetStringUTF16(IDS_SYNC_GAIA_CAPTCHA_CASE_INSENSITIVE_TIP));
+  label = new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_SYNC_GAIA_CAPTCHA_CASE_INSENSITIVE_TIP)));
   label->SetMultiLine(true);
   layout->AddView(label);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   if (is_standalone_) {
     layout->StartRow(0, column_view_set_id);
     ok_button_ = new WideTextButton(
         this, UTF16ToWide(l10n_util::GetStringUTF16(IDS_OK)));
     ok_button_->set_alignment(views::TextButton::ALIGN_CENTER);
     ok_button_->set_focusable(true);
     static_cast<views::TextButtonBorder*>(ok_button_->border())->
         copy_normal_set_to_hot_set();
     ok_button_->set_animate_on_state_change(false);
     ok_button_->SetEnabledColor(SK_ColorBLACK);
     ok_button_->SetHighlightColor(SK_ColorBLACK);
     ok_button_->SetHoverColor(SK_ColorBLACK);
     layout->AddView(ok_button_, 1, 1,
                     views::GridLayout::CENTER, views::GridLayout::CENTER);
   }
 
   // ImageDownloader will delete itself once URL is fetched.
   // TODO(nkostylev): Make sure that it works after view is deleted.
   new ImageDownloader(this, GURL(captcha_url_), std::string());
 }
 
 }  // namespace chromeos