Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: chrome/browser/chromeos/login/network_selection_view.cc

Issue 6156001: Remove wstring from l10n_util. Part 8, the last part.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/network_screen.cc ('k') | chrome/browser/chromeos/login/new_user_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/network_selection_view.cc
===================================================================
--- chrome/browser/chromeos/login/network_selection_view.cc (revision 70736)
+++ chrome/browser/chromeos/login/network_selection_view.cc (working copy)
@@ -334,15 +334,16 @@
UTF16ToWide(delegate_->language_switch_menu()->GetCurrentLocaleName()));
keyboards_menubutton_->SetText(
UTF16ToWide(delegate_->keyboard_switch_menu()->GetCurrentKeyboardName()));
- welcome_label_->SetText(l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE));
+ welcome_label_->SetText(
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)));
select_language_label_->SetText(
- l10n_util::GetString(IDS_LANGUAGE_SELECTION_SELECT));
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT)));
select_keyboard_label_->SetText(
- l10n_util::GetString(IDS_KEYBOARD_SELECTION_SELECT));
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT)));
select_network_label_->SetText(
- l10n_util::GetString(IDS_NETWORK_SELECTION_SELECT));
- proxy_settings_link_->SetText(
- l10n_util::GetString(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON));
+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT)));
+ proxy_settings_link_->SetText(UTF16ToWide(
+ l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)));
RecreateNativeControls();
UpdateConnectingNetworkLabel();
network_dropdown_->Refresh();
@@ -448,13 +449,14 @@
delete continue_button_;
continue_button_ = new login::WideButton(
delegate_,
- l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON));
+ UTF16ToWide(
+ l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON)));
continue_button_->SetEnabled(is_continue_enabled);
}
void NetworkSelectionView::UpdateConnectingNetworkLabel() {
- connecting_network_label_->SetText(l10n_util::GetStringF(
- IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_)));
+ connecting_network_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
+ IDS_NETWORK_SELECTION_CONNECTING, network_id_)));
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/login/network_screen.cc ('k') | chrome/browser/chromeos/login/new_user_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698