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

chrome/browser/chromeos/status/network_menu_button.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/status/network_menu_button.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "app/l10n_util.h"
@@ skipping 103 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, private methods
 
 void NetworkMenuButton::SetNetworkIcon(NetworkLibrary* cros,
                                        const Network* network) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   if (!cros || !CrosLibrary::Get()->EnsureLoaded()) {
     SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
     SetBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_WARNING));
-    SetTooltipText(l10n_util::GetString(
-        IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
+    SetTooltipText(UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP)));
     return;
   }
 
   if (!cros->Connected() && !cros->Connecting()) {
     animation_connecting_.Stop();
     SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
     SetBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_DISCONNECTED));
-    SetTooltipText(l10n_util::GetString(
-        IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
+    SetTooltipText(UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP)));
     return;
   }
 
   if (cros->wifi_connecting() || cros->cellular_connecting()) {
     // Start the connecting animation if not running.
     if (!animation_connecting_.is_animating()) {
       animation_connecting_.Reset();
       animation_connecting_.StartThrobbing(-1);
       SetIcon(IconForNetworkConnecting(0, false));
     }
     const WirelessNetwork* wireless = NULL;
     if (cros->wifi_connecting()) {
       wireless = cros->wifi_network();
       SetBadge(SkBitmap());
     } else {  // cellular_connecting
       wireless = cros->cellular_network();
       SetBadge(BadgeForNetworkTechnology(cros->cellular_network()));
     }
-    SetTooltipText(
-        l10n_util::GetStringF(wireless->configuring() ?
-            IDS_STATUSBAR_NETWORK_CONFIGURING_TOOLTIP :
-            IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP,
-            UTF8ToWide(wireless->name())));
+    SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
+        wireless->configuring() ? IDS_STATUSBAR_NETWORK_CONFIGURING_TOOLTIP
+                                : IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP,
+        UTF8ToUTF16(wireless->name()))));
   } else {
     // Stop connecting animation since we are not connecting.
     animation_connecting_.Stop();
     // Only set the icon, if it is an active network that changed.
     if (network && network->is_active()) {
       if (network->type() == TYPE_ETHERNET) {
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
         SetBadge(SkBitmap());
         SetTooltipText(
-            l10n_util::GetStringF(
+            UTF16ToWide(l10n_util::GetStringFUTF16(
                 IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-                l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)));
+                l10n_util::GetStringUTF16(
+                    IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET))));
       } else if (network->type() == TYPE_WIFI) {
         const WifiNetwork* wifi = static_cast<const WifiNetwork*>(network);
         SetIcon(IconForNetworkStrength(wifi, false));
         SetBadge(SkBitmap());
-        SetTooltipText(l10n_util::GetStringF(
+        SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(wifi->name())));
+            UTF8ToUTF16(wifi->name()))));
       } else if (network->type() == TYPE_CELLULAR) {
         const CellularNetwork* cellular =
             static_cast<const CellularNetwork*>(network);
         SetIcon(IconForNetworkStrength(cellular, false));
         SetBadge(BadgeForNetworkTechnology(cellular));
-        SetTooltipText(l10n_util::GetStringF(
+        SetTooltipText(UTF16ToWide(l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(cellular->name())));
+            UTF8ToUTF16(cellular->name()))));
       }
     }
   }
 }
 
 void NetworkMenuButton::RefreshNetworkObserver(NetworkLibrary* cros) {
   const Network* network = cros->active_network();
   std::string new_network = network ? network->service_path() : std::string();
   if (active_network_ != new_network) {
     if (!active_network_.empty()) {
       cros->RemoveNetworkObserver(active_network_, this);
     }
     if (!new_network.empty()) {
       cros->AddNetworkObserver(new_network, this);
     }
     active_network_ = new_network;
   }
 }
 
 }  // namespace chromeos