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

chrome/browser/chromeos/options/network_config_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/options/network_config_view.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
@@ skipping 13 matching lines @@
 
 NetworkConfigView::NetworkConfigView(const WifiNetwork* wifi)
     : browser_mode_(true),
       title_(ASCIIToWide(wifi->name())),
       wificonfig_view_(new WifiConfigView(this, wifi)),
       delegate_(NULL) {
 }
 
 NetworkConfigView::NetworkConfigView()
     : browser_mode_(true),
-      title_(l10n_util::GetString(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS)),
+      title_(UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS))),
       wificonfig_view_(new WifiConfigView(this)),
       delegate_(NULL) {
 }
 
 gfx::NativeWindow NetworkConfigView::GetNativeWindow() const {
   return GTK_WINDOW(static_cast<WidgetGtk*>(GetWidget())->GetNativeView());
 }
 
 std::wstring NetworkConfigView::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK)
-    return l10n_util::GetString(IDS_OPTIONS_SETTINGS_CONNECT);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT));
   return std::wstring();
 }
 
 bool NetworkConfigView::IsDialogButtonEnabled(
     MessageBoxFlags::DialogButton button) const {
   // Disable connect button if cannot login.
   if (button == MessageBoxFlags::DIALOGBUTTON_OK)
     return wificonfig_view_->can_login();
   return true;
 }
@@ skipping 31 matching lines @@
 
 void NetworkConfigView::ViewHierarchyChanged(
     bool is_add, views::View* parent, views::View* child) {
   // Can't init before we're inserted into a Container, because we require
   // a HWND to parent native child controls to.
   if (is_add && child == this)
     AddChildView(wificonfig_view_);
 }
 
 }  // namespace chromeos