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

Unified Diff: chrome/browser/chromeos/options/language_hangul_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_hangul_config_view.cc
===================================================================
--- chrome/browser/chromeos/options/language_hangul_config_view.cc (revision 70736)
+++ chrome/browser/chromeos/options/language_hangul_config_view.cc (working copy)
@@ -111,14 +111,14 @@
std::wstring LanguageHangulConfigView::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 LanguageHangulConfigView::GetWindowTitle() const {
- return l10n_util::GetString(
- IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_TITLE);
+ return UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_TITLE));
}
gfx::Size LanguageHangulConfigView::GetPreferredSize() {
@@ -150,8 +150,8 @@
layout->StartRow(0, kColumnSetId);
// Settings for the Hangul IME.
- layout->AddView(new views::Label(
- l10n_util::GetString(IDS_OPTIONS_SETTINGS_KEYBOARD_LAYOUT_TEXT)));
+ layout->AddView(new views::Label(UTF16ToWide(
+ l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_KEYBOARD_LAYOUT_TEXT))));
hangul_keyboard_combobox_
= new views::Combobox(hangul_keyboard_combobox_model_.get());
« no previous file with comments | « chrome/browser/chromeos/options/language_config_view.cc ('k') | chrome/browser/chromeos/options/language_mozc_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698