| 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 82f8e353be400411fc3a06c1e93c761874a42721..3712ace5b1c9a2d3bcdf0f4d09573d33811feccb 100644
|
| --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
| @@ -85,7 +85,12 @@ void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
|
| const input_method::InputMethodUtil& util,
|
| ash::IMEInfo* info) {
|
| info->id = ime.id();
|
| - info->name = UTF8ToUTF16(util.GetInputMethodDisplayNameFromId(info->id));
|
| + std::string name = util.GetInputMethodDisplayNameFromId(info->id);
|
| + if (name.empty()) {
|
| + name = ime.name();
|
| + }
|
| + info->name = UTF8ToUTF16(name);
|
| +
|
| info->short_name = util.GetInputMethodShortName(ime);
|
| }
|
|
|
|
|