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

Unified Diff: chrome/browser/chromeos/options/language_mozc_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_mozc_config_view.cc
===================================================================
--- chrome/browser/chromeos/options/language_mozc_config_view.cc (revision 70736)
+++ chrome/browser/chromeos/options/language_mozc_config_view.cc (working copy)
@@ -122,14 +122,14 @@
std::wstring LanguageMozcConfigView::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 LanguageMozcConfigView::GetWindowTitle() const {
- return l10n_util::GetString(
- IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SETTINGS_TITLE);
+ return UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SETTINGS_TITLE));
}
gfx::Size LanguageMozcConfigView::GetPreferredSize() {
@@ -166,8 +166,9 @@
for (size_t i = 0; i < language_prefs::kNumMozcBooleanPrefs; ++i) {
MozcPrefAndAssociatedCheckbox& current = prefs_and_checkboxes_[i];
- current.checkbox = new views::Checkbox(
- l10n_util::GetString(language_prefs::kMozcBooleanPrefs[i].message_id));
+ current.checkbox = new views::Checkbox(UTF16ToWide(
+ l10n_util::GetStringUTF16(
+ language_prefs::kMozcBooleanPrefs[i].message_id)));
current.checkbox->set_listener(this);
current.checkbox->set_tag(i);
}
@@ -190,8 +191,8 @@
NotifyPrefChanged(); // Sync the comboboxes with current Chrome prefs.
reset_to_defaults_button_ = new views::NativeButton(
- this, l10n_util::GetString(
- IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_RESET_TO_DEFAULTS_BUTTON));
+ this, UTF16ToWide(l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_RESET_TO_DEFAULTS_BUTTON)));
reset_to_defaults_button_->set_tag(kResetToDefaultsButton);
layout->StartRow(0, kColumnSetId);
layout->AddView(reset_to_defaults_button_);
@@ -213,8 +214,8 @@
const MozcPrefAndAssociatedSlider& current = prefs_and_sliders_[i];
layout->StartRow(0, kColumnSetId);
layout->AddView(new views::Label(
- l10n_util::GetString(
- language_prefs::kMozcIntegerPrefs[i].message_id)));
+ UTF16ToWide(l10n_util::GetStringUTF16(
+ language_prefs::kMozcIntegerPrefs[i].message_id))));
layout->AddView(current.slider);
}
NotifyPrefChanged(); // Sync the slider with current Chrome prefs.

Powered by Google App Engine
This is Rietveld 408576698