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

chrome/browser/chromeos/options/internet_page_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/internet_page_view.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 161 matching lines @@
 
   if (num_buttons > 0) {
     // We only support 2 buttons.
     DCHECK_LE(num_buttons, 2);
 
     if (num_buttons == 1)
       layout_->SkipColumns(1);
 
     if (button_flags & FORGET_BUTTON) {
       views::NativeButton* button = new views::NativeButton(this,
-          l10n_util::GetString(IDS_OPTIONS_SETTINGS_FORGET));
+          UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_FORGET)));
       button->set_tag(id + kButtonIdOffset * FORGET_BUTTON);
       layout_->AddView(button, 1, 2);
     }
 
     if (button_flags & DISCONNECT_BUTTON) {
-      views::NativeButton* button = new views::NativeButton(this,
-          l10n_util::GetString(IDS_OPTIONS_SETTINGS_DISCONNECT));
+      views::NativeButton* button = new views::NativeButton(this, UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_DISCONNECT)));
       button->set_tag(id + kButtonIdOffset * DISCONNECT_BUTTON);
       layout_->AddView(button, 1, 2);
     }
 
     if (button_flags & CONNECT_BUTTON) {
       views::NativeButton* button = new views::NativeButton(this,
-          l10n_util::GetString(IDS_OPTIONS_SETTINGS_CONNECT));
+          UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT)));
       button->set_tag(id + kButtonIdOffset * CONNECT_BUTTON);
       layout_->AddView(button, 1, 2);
     }
 
     if (button_flags & OPTIONS_BUTTON) {
       views::NativeButton* button = new views::NativeButton(this,
-          l10n_util::GetString(IDS_OPTIONS_SETTINGS_OPTIONS));
+          UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OPTIONS)));
       button->set_tag(id + kButtonIdOffset * OPTIONS_BUTTON);
       layout_->AddView(button, 1, 2);
     }
   }
 
   layout_->StartRow(0, quad_column_view_set_id_);
   layout_->SkipColumns(1);
   views::Label* status_label = new views::Label(status);
   status_label->SetFont(rb.GetFont(ResourceBundle::SmallFont));
   status_label->SetColor(SK_ColorLTGRAY);
@@ skipping 33 matching lines @@
 void WiredSection::InitSection() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   SkBitmap icon = *rb.GetBitmapNamed(IDR_STATUSBAR_WIRED_BLACK);
   if (!cros->ethernet_connecting() && !cros->ethernet_connected()) {
     icon = NetworkMenu::IconForDisplay(icon,
         *rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
   }
 
-  std::wstring name =
-      l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
+  std::wstring name = UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
 
   int s = IDS_STATUSBAR_NETWORK_DEVICE_DISABLED;
   if (cros->ethernet_connecting())
     s = IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING;
   else if (cros->ethernet_connected())
     s = IDS_STATUSBAR_NETWORK_DEVICE_CONNECTED;
   else if (cros->ethernet_enabled())
     s = IDS_STATUSBAR_NETWORK_DEVICE_DISCONNECTED;
-  std::wstring status = l10n_util::GetString(s);
+  std::wstring status = UTF16ToWide(l10n_util::GetStringUTF16(s));
 
   int flags = cros->ethernet_connected() ? OPTIONS_BUTTON : 0;
   bool bold = cros->ethernet_connected() ? true : false;
   AddNetwork(0, icon, name, bold, status, flags, TYPE_ETHERNET);
 }
 
 void WiredSection::ButtonClicked(int button, int connection_type, int id) {
 //  CreateModalPopup(new NetworkConfigView(
 //      CrosLibrary::Get()->GetNetworkLibrary()->ethernet_network()));
 }
@@ skipping 114 matching lines @@
 void WirelessSection::AddWirelessNetwork(int id, const SkBitmap& icon,
     const std::wstring& name, bool connecting, bool connected,
     int connection_type) {
   bool bold = connecting || connected;
 
   int s = IDS_STATUSBAR_NETWORK_DEVICE_DISCONNECTED;
   if (connecting)
     s = IDS_STATUSBAR_NETWORK_DEVICE_CONNECTING;
   else if (connected)
     s = IDS_STATUSBAR_NETWORK_DEVICE_CONNECTED;
-  std::wstring status = l10n_util::GetString(s);
+  std::wstring status = UTF16ToWide(l10n_util::GetStringUTF16(s));
 
   int flags = 0;
   if (connected) {
     flags |= DISCONNECT_BUTTON | OPTIONS_BUTTON;
   } else if (!connecting) {
     flags |= CONNECT_BUTTON;
   }
 
   AddNetwork(id, icon, name, bold, status, flags, connection_type);
 }
@@ skipping 174 matching lines @@
   scroll_view_->SetBounds(GetLocalBounds(false));
   scroll_view_->Layout();
 }
 
 void InternetPageView::InitControlLayout() {
   AddChildView(scroll_view_);
   scroll_view_->SetContents(contents_view_);
 }
 
 }  // namespace chromeos