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

Unified Diff: chrome/browser/chromeos/options/language_config_model.cc

Issue 3159031: Remove wstrings from bookmarks, part 12. (Closed)
Patch Set: rebased ToT Created 10 years, 4 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_config_model.cc
diff --git a/chrome/browser/chromeos/options/language_config_model.cc b/chrome/browser/chromeos/options/language_config_model.cc
index c6247a0f1a2e15ea0fa44415bb27d4a35485d64d..3e4ac6fd61d100a55344bb1fd6cb274cfa97f296 100644
--- a/chrome/browser/chromeos/options/language_config_model.cc
+++ b/chrome/browser/chromeos/options/language_config_model.cc
@@ -31,13 +31,13 @@ int AddLanguageComboboxModel::GetItemCount() {
return get_languages_count() + 1 - ignore_set_.size();
}
-std::wstring AddLanguageComboboxModel::GetItemAt(int index) {
+string16 AddLanguageComboboxModel::GetItemAt(int index) {
// Show "Add language" as the first item.
if (index == 0) {
- return l10n_util::GetString(
+ return l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_LANGUAGE_COMBOBOX);
}
- return GetLanguageNameAt(GetLanguageIndex(index));
+ return WideToUTF16Hack(GetLanguageNameAt(GetLanguageIndex(index)));
}
int AddLanguageComboboxModel::GetLanguageIndex(int index) const {

Powered by Google App Engine
This is Rietveld 408576698