| Index: chrome/browser/chromeos/status/network_dropdown_button.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/status/network_dropdown_button.cc (revision 70736)
|
| +++ chrome/browser/chromeos/status/network_dropdown_button.cc (working copy)
|
| @@ -26,7 +26,8 @@
|
| NetworkDropdownButton::NetworkDropdownButton(bool browser_mode,
|
| gfx::NativeWindow parent_window)
|
| : DropDownButton(NULL,
|
| - l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE),
|
| + UTF16ToWide(l10n_util::GetStringUTF16(
|
| + IDS_STATUSBAR_NO_NETWORKS_MESSAGE)),
|
| this,
|
| true),
|
| browser_mode_(browser_mode),
|
| @@ -79,7 +80,8 @@
|
| animation_connecting_.Stop();
|
| if (active_network->type() == TYPE_ETHERNET) {
|
| SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
|
| - SetText(l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
|
| + SetText(UTF16ToWide(
|
| + l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)));
|
| } else if (active_network->type() == TYPE_WIFI) {
|
| const WifiNetwork* wifi =
|
| static_cast<const WifiNetwork*>(active_network);
|
| @@ -108,12 +110,14 @@
|
| if (!cros->Connected() && !cros->Connecting()) {
|
| animation_connecting_.Stop();
|
| SetIcon(SkBitmap());
|
| - SetText(l10n_util::GetString(IDS_NETWORK_SELECTION_NONE));
|
| + SetText(UTF16ToWide(
|
| + l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_NONE)));
|
| }
|
| } else {
|
| animation_connecting_.Stop();
|
| SetIcon(SkBitmap());
|
| - SetText(l10n_util::GetString(IDS_STATUSBAR_NO_NETWORKS_MESSAGE));
|
| + SetText(UTF16ToWide(
|
| + l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE)));
|
| }
|
|
|
| SchedulePaint();
|
|
|