Remove wstring from l10n_util. Part 8, the last part....

chrome/browser/chromeos/login/network_selection_view.cc

 // Copyright (c) 2010 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 316 matching lines @@
   proxy_settings_link_->SetHighlightedColor(login::kLinkColor);
 
   UpdateLocalizedStrings();
 }
 
 void NetworkSelectionView::UpdateLocalizedStrings() {
   languages_menubutton_->SetText(
       UTF16ToWide(delegate_->language_switch_menu()->GetCurrentLocaleName()));
   keyboards_menubutton_->SetText(
       UTF16ToWide(delegate_->keyboard_switch_menu()->GetCurrentKeyboardName()));
-  welcome_label_->SetText(l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE));
+  welcome_label_->SetText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)));
   select_language_label_->SetText(
-      l10n_util::GetString(IDS_LANGUAGE_SELECTION_SELECT));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT)));
   select_keyboard_label_->SetText(
-      l10n_util::GetString(IDS_KEYBOARD_SELECTION_SELECT));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT)));
   select_network_label_->SetText(
-      l10n_util::GetString(IDS_NETWORK_SELECTION_SELECT));
-  proxy_settings_link_->SetText(
-      l10n_util::GetString(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON));
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT)));
+  proxy_settings_link_->SetText(UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)));
   RecreateNativeControls();
   UpdateConnectingNetworkLabel();
   network_dropdown_->Refresh();
   InitLayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::View: implementation:
 
 bool NetworkSelectionView::OnKeyPressed(const views::KeyEvent&) {
@@ skipping 85 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkSelectionView, private:
 
 void NetworkSelectionView::RecreateNativeControls() {
   // There is no way to get native button preferred size after the button was
   // sized so delete and recreate the button on text update.
   bool is_continue_enabled = IsContinueEnabled();
   delete continue_button_;
   continue_button_ = new login::WideButton(
       delegate_,
-      l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON));
+      UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)));
   continue_button_->SetEnabled(is_continue_enabled);
 }
 
 void NetworkSelectionView::UpdateConnectingNetworkLabel() {
-  connecting_network_label_->SetText(l10n_util::GetStringF(
-      IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_)));
+  connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
+      IDS_NETWORK_SELECTION_CONNECTING, network_id_)));
 }
 
 }  // namespace chromeos