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

Unified Diff: chrome/browser/chromeos/options/language_chewing_config_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
Index: chrome/browser/chromeos/options/language_chewing_config_view.cc
===================================================================
--- chrome/browser/chromeos/options/language_chewing_config_view.cc (revision 70736)
+++ chrome/browser/chromeos/options/language_chewing_config_view.cc (working copy)
@@ -115,14 +115,14 @@
std::wstring LanguageChewingConfigView::GetDialogButtonLabel(
MessageBoxFlags::DialogButton button) const {
if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
- return l10n_util::GetString(IDS_OK);
+ return UTF16ToWide(l10n_util::GetStringUTF16(IDS_OK));
}
return L"";
}
std::wstring LanguageChewingConfigView::GetWindowTitle() const {
- return l10n_util::GetString(
- IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE);
+ return UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE));
}
gfx::Size LanguageChewingConfigView::GetPreferredSize() {
@@ -153,8 +153,8 @@
for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) {
chewing_boolean_checkboxes_[i] = new views::Checkbox(
- l10n_util::GetString(
- language_prefs::kChewingBooleanPrefs[i].message_id));
+ UTF16ToWide(l10n_util::GetStringUTF16(
+ language_prefs::kChewingBooleanPrefs[i].message_id)));
chewing_boolean_checkboxes_[i]->set_listener(this);
chewing_boolean_checkboxes_[i]->set_tag(i);
}
@@ -185,8 +185,8 @@
for (size_t i = 0; i < language_prefs::kNumChewingIntegerPrefs; ++i) {
layout->StartRow(0, kColumnSetId);
layout->AddView(new views::Label(
- l10n_util::GetString(
- language_prefs::kChewingIntegerPrefs[i].message_id)));
+ UTF16ToWide(l10n_util::GetStringUTF16(
+ language_prefs::kChewingIntegerPrefs[i].message_id))));
layout->AddView(chewing_integer_sliders_[i]);
}
NotifyPrefChanged();
« no previous file with comments | « chrome/browser/chromeos/options/internet_page_view.cc ('k') | chrome/browser/chromeos/options/language_config_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698