Remove wstrings from bookmarks, part 12.

chrome/browser/chromeos/login/network_screen.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_screen.h"
 
 #include "app/l10n_util.h"
+#include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/network_selection_view.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "grit/generated_resources.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
 
@@ skipping 29 matching lines @@
 // ComboboxModel implementation:
 
 int NetworkScreen::GetItemCount() {
   // Item with index = 0 is either "no networks are available" or
   // "no selection".
   // If WiFi is disabled adding extra item to enable it.
   return static_cast<int>(networks_.GetNetworkCount()) + 1 +
       (wifi_disabled_ ? 1 : 0);
 }
 
-std::wstring NetworkScreen::GetItemAt(int index) {
+string16 NetworkScreen::GetItemAt(int index) {
   if (index == 0) {
     return networks_.IsEmpty() ?
-        l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE) :
-        l10n_util::GetString(IDS_NETWORK_SELECTION_NONE);
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE) :
+        l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_NONE);
   }
   if (wifi_disabled_ &&
       index == static_cast<int>(networks_.GetNetworkCount()) + 1) {
-    return l10n_util::GetStringF(
+    return l10n_util::GetStringFUTF16(
         IDS_STATUSBAR_NETWORK_DEVICE_ENABLE,
-        l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_WIFI));
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_WIFI));
   }
   NetworkList::NetworkItem* network =
       networks_.GetNetworkAt(index - 1);
-  return network ? UTF16ToWide(network->label) : std::wstring();
+  return network ? network->label : string16();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::Combobox::Listener implementation:
 
 void NetworkScreen::ItemChanged(views::Combobox* sender,
                                 int prev_index,
                                 int new_index) {
   view()->EnableContinue(new_index > 0);
   // Corner case: item with index 0 is "No selection". Just select it.
@@ skipping 239 matching lines @@
   if (connection_timer_.IsRunning())
     connection_timer_.Stop();
   connection_timer_.Start(base::TimeDelta::FromSeconds(kConnectionTimeoutSec),
                           this,
                           &NetworkScreen::OnConnectionTimeout);
   if (continue_pressed_)
     ShowConnectingStatus();
 }
 
 }  // namespace chromeos