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

chrome/browser/chromeos/login/password_changed_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/password_changed_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/textfield_with_margin.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
@@ skipping 79 matching lines @@
 
 void PasswordChangedView::Init() {
   // Set up fonts.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::Font title_font = rb.GetFont(ResourceBundle::MediumBoldFont);
 
   // Create controls
   title_label_ = new Label();
   title_label_->SetFont(title_font);
   title_label_->SetText(
-      l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD_CHANGED_TITLE));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD_CHANGED_TITLE)));
   title_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
 
   description_label_ = new Label();
   description_label_->SetText(
-      l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD_CHANGED_DESC));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD_CHANGED_DESC)));
   description_label_->SetMultiLine(true);
   description_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
 
   full_sync_radio_ = new RadioButton(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD_CHANGED_RESET)),
       0);
   full_sync_radio_->set_listener(this);
   full_sync_radio_->SetMultiLine(true);
 
   delta_sync_radio_ = new RadioButton(
@@ skipping 80 matching lines @@
     old_password_field_->RequestFocus();
   }
 }
 
 bool PasswordChangedView::HandleKeyEvent(views::Textfield* sender,
                                          const views::KeyEvent& keystroke) {
   return false;
 }
 
 }  // namespace chromeos