| 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 {
|
|
|