| Index: chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
|
| index 4a345f21a2b1509850929d01a51a5f1089d5f82d..46b7c3ca0f32ad142c971274b096d1138dedf53c 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
|
| +++ b/chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc
|
| @@ -185,13 +185,11 @@ ListValue* CrosLanguageOptionsHandler::GetLanguageListInternal(
|
| *iter) == base_language_codes.end()) {
|
| continue;
|
| }
|
| - input_method::InputMethodUtil* input_method_util =
|
| - input_method::GetInputMethodManager()->GetInputMethodUtil();
|
| const string16 display_name =
|
| - input_method_util->GetLanguageDisplayNameFromCode(*iter);
|
| + l10n_util::GetDisplayNameForLocale(*iter, app_locale, true);
|
| const string16 native_display_name =
|
| - input_method::InputMethodUtil::GetLanguageNativeDisplayNameFromCode(
|
| - *iter);
|
| + l10n_util::GetDisplayNameForLocale(*iter, *iter, true);
|
| +
|
| display_names.push_back(display_name);
|
| language_map[display_name] =
|
| std::make_pair(*iter, native_display_name);
|
|
|