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

chrome/browser/chromeos/login/network_selection_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/network_selection_view.h"
 
 #include <signal.h>
 #include <sys/types.h>
 
 #include <string>
@@ skipping 325 matching lines @@
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
 
   SetMenuButtonFont(languages_menubutton_, base_font);
   languages_menubutton_->SetText(
       UTF16ToWide(actor_->language_switch_menu()->GetCurrentLocaleName()));
   SetMenuButtonFont(keyboards_menubutton_, base_font);
   keyboards_menubutton_->SetText(
       UTF16ToWide(actor_->keyboard_switch_menu()->GetCurrentKeyboardName()));
   welcome_label_->SetFont(welcome_label_font);
   welcome_label_->SetText(
-      l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)));
   select_language_label_->SetFont(select_label_font);
   select_language_label_->SetText(
-      l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT)));
   languages_menubutton_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT));
   select_keyboard_label_->SetFont(select_label_font);
   select_keyboard_label_->SetText(
-      l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT)));
   keyboards_menubutton_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT));
   select_network_label_->SetFont(select_label_font);
   select_network_label_->SetText(
-      l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT)));
   SetMenuButtonFont(network_dropdown_, base_font);
   network_dropdown_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT));
   proxy_settings_link_->SetFont(base_font);
-  proxy_settings_link_->SetText(
-      l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON));
+  proxy_settings_link_->SetText(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)));
   connecting_network_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
   RecreateNativeControls();
   UpdateConnectingNetworkLabel();
   network_dropdown_->Refresh();
   InitLayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::View: implementation:
 
@@ skipping 89 matching lines @@
   bool is_continue_enabled = IsContinueEnabled();
   delete continue_button_;
   continue_button_ = new login::WideButton(
       actor_,
       UTF16ToWide(
           l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)));
   continue_button_->SetEnabled(is_continue_enabled);
 }
 
 void NetworkSelectionView::UpdateConnectingNetworkLabel() {
-  connecting_network_label_->SetText(l10n_util::GetStringFUTF16(
-      IDS_NETWORK_SELECTION_CONNECTING, network_id_));
+  connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
+      IDS_NETWORK_SELECTION_CONNECTING, network_id_)));
 }
 
 }  // namespace chromeos