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

Unified Diff: chrome/browser/chromeos/options/language_pinyin_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_pinyin_config_view.cc
===================================================================
--- chrome/browser/chromeos/options/language_pinyin_config_view.cc (revision 70736)
+++ chrome/browser/chromeos/options/language_pinyin_config_view.cc (working copy)
@@ -76,14 +76,14 @@
std::wstring LanguagePinyinConfigView::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 LanguagePinyinConfigView::GetWindowTitle() const {
- return l10n_util::GetString(
- IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE);
+ return UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE));
}
gfx::Size LanguagePinyinConfigView::GetPreferredSize() {
@@ -115,8 +115,8 @@
for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
pinyin_boolean_checkboxes_[i] = new views::Checkbox(
- l10n_util::GetString(
- language_prefs::kPinyinBooleanPrefs[i].message_id));
+ UTF16ToWide(l10n_util::GetStringUTF16(
+ language_prefs::kPinyinBooleanPrefs[i].message_id)));
pinyin_boolean_checkboxes_[i]->set_listener(this);
pinyin_boolean_checkboxes_[i]->set_tag(i);
}
« no previous file with comments | « chrome/browser/chromeos/options/language_mozc_config_view.cc ('k') | chrome/browser/chromeos/options/network_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698