| Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| index 10887c8568181ac8f5bdf8b99447c7f4d9346bdc..f1f5f260e6ed6fc319426becc12eeaa1f5a751bb 100644
|
| --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| @@ -84,12 +84,7 @@ void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
|
| const input_method::InputMethodUtil& util,
|
| ash::IMEInfo* info) {
|
| info->id = ime.id();
|
| - std::string name = util.GetInputMethodDisplayNameFromId(info->id);
|
| - if (name.empty()) {
|
| - name = ime.name();
|
| - }
|
| - info->name = UTF8ToUTF16(name);
|
| -
|
| + info->name = util.GetInputMethodLongName(ime);
|
| info->short_name = util.GetInputMethodShortName(ime);
|
| }
|
|
|
|
|