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

chrome/browser/chromeos/login/new_user_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/new_user_view.h"
 
 #include <signal.h>
 #include <sys/types.h>
 
 #include <algorithm>
@@ skipping 271 matching lines @@
 }
 
 void NewUserView::UpdateLocalizedStringsAndFonts() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::Font title_font = rb.GetFont(ResourceBundle::MediumBoldFont).DeriveFont(
       kLoginTitleFontDelta);
   const gfx::Font& title_hint_font = rb.GetFont(ResourceBundle::BoldFont);
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
 
   title_label_->SetFont(title_font);
-  title_label_->SetText(
-      l10n_util::GetStringUTF16(IDS_LOGIN_TITLE));
+  title_label_->SetText(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_LOGIN_TITLE)));
   title_hint_label_->SetFont(title_hint_font);
-  title_hint_label_->SetText(l10n_util::GetStringUTF16(IDS_LOGIN_TITLE_HINT));
+  title_hint_label_->SetText(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_LOGIN_TITLE_HINT)));
   SetAndCorrectTextfieldFont(username_field_, base_font);
   username_field_->set_text_to_display_when_empty(
       l10n_util::GetStringUTF16(IDS_LOGIN_USERNAME));
   SetAndCorrectTextfieldFont(password_field_, base_font);
   password_field_->set_text_to_display_when_empty(
       l10n_util::GetStringUTF16(IDS_LOGIN_PASSWORD));
   sign_in_button_->SetText(UTF16ToWide(
       l10n_util::GetStringUTF16(IDS_LOGIN_BUTTON)));
   if (need_guest_link_) {
     guest_link_->SetFont(base_font);
-    guest_link_->SetText(
-        l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON));
+    guest_link_->SetText(UTF16ToWide(
+        l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON)));
   }
   if (need_create_account_) {
     create_account_link_->SetFont(base_font);
     create_account_link_->SetText(
-        l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_BUTTON));
+        UTF16ToWide(l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_BUTTON)));
   }
   delegate_->ClearErrors();
   languages_menubutton_->SetText(
       UTF16ToWide(language_switch_menu_.GetCurrentLocaleName()));
 }
 
 void NewUserView::OnLocaleChanged() {
   RecreatePeculiarControls();
   UpdateLocalizedStringsAndFonts();
   AddChildView(sign_in_button_);
@@ skipping 96 matching lines @@
   height = username_field_->GetPreferredSize().height() +
            password_field_->GetPreferredSize().height() +
            sign_in_button_->GetPreferredSize().height() +
            2 * kRowPad;
   y = title_end + (bottom_start - title_end - height) / 2;
 
   y += setViewBounds(username_field_, x, y, width, true) + kRowPad;
   y += setViewBounds(password_field_, x, y, width, true) + kRowPad;
 
   int sign_in_button_width = sign_in_button_->GetPreferredSize().width();
-  setViewBounds(sign_in_button_, x, y, sign_in_button_width, true);
+  setViewBounds(sign_in_button_, x, y, sign_in_button_width,true);
 
   SchedulePaint();
 }
 
 gfx::Size NewUserView::GetPreferredSize() {
   return need_guest_link_ ?
       gfx::Size(kNewUserPodFullWidth, kNewUserPodFullHeight) :
       gfx::Size(kNewUserPodSmallWidth, kNewUserPodSmallHeight);
 }
 
@@ skipping 123 matching lines @@
   if (username_field_->text().empty() &&
       password_field_->text().empty()) {
     delegate_->NavigateAway();
     return true;
   } else {
     return false;
   }
 }
 
 void NewUserView::InitLink(views::Link** link) {
-  *link = new views::Link(string16());
+  *link = new views::Link(std::wstring());
   (*link)->set_listener(this);
   (*link)->SetNormalColor(login::kLinkColor);
   (*link)->SetHighlightedColor(login::kLinkColor);
   AddChildView(*link);
 }
 
 }  // namespace chromeos