fix "IME changed" notification uses a wrong field of IME

chrome/browser/chromeos/input_method/input_method_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 28 matching lines @@
   { "english-m", "??" },
   { "xkb:de:neo:ger", "NEO" },
   // To distinguish from "xkb:es::spa"
   { "xkb:es:cat:cat", "CAS" },
   // To distinguish from "xkb:gb::eng"
   { "xkb:gb:dvorak:eng", "DV" },
   // To distinguish from "xkb:jp::jpn"
   { "mozc", "\xe3\x81\x82" },  // U+3042, Japanese Hiragana letter A in UTF-8.
   { "mozc-dv", "\xe3\x81\x82" },
   { "mozc-jp", "\xe3\x81\x82" },
-  { "zinnia-japanese", "\xe6\x89\x8b" },  // U+624B, "hand"
   // For simplified Chinese input methods
   { "pinyin", "\xe6\x8b\xbc" },  // U+62FC
   { "pinyin-dv", "\xe6\x8b\xbc" },
   // For traditional Chinese input methods
   { "mozc-chewing", "\xe9\x85\xb7" },  // U+9177
   { "m17n:zh:cangjie", "\xe5\x80\x89" },  // U+5009
   { "m17n:zh:quick", "\xe9\x80\x9f" },  // U+901F
   // For Hangul input method.
   { "mozc-hangul", "\xed\x95\x9c" },  // U+D55C
 };
 
 const size_t kMappingFromIdToIndicatorTextLen =
     ARRAYSIZE_UNSAFE(kMappingFromIdToIndicatorText);
 
+// A mapping from an input method id to a resource id for a
+// medium length language indicator.
+// For those languages that want to display a slightly longer text in the
+// "Your input method has changed to..." bubble than in the status tray.
+// If an entry is not found in this table the short name is used.
+const struct {
+  const char* input_method_id;
+  const int resource_id;
+} kMappingImeIdToMediumLenNameResourceId[] = {
+  { "m17n:zh:cangjie", IDS_LANGUAGES_MEDIUM_LEN_NAME_CHINESE_TRADITIONAL },
+  { "m17n:zh:quick", IDS_LANGUAGES_MEDIUM_LEN_NAME_CHINESE_TRADITIONAL },
+  { "mozc", IDS_LANGUAGES_MEDIUM_LEN_NAME_JAPANESE },
+  { "mozc-chewing", IDS_LANGUAGES_MEDIUM_LEN_NAME_CHINESE_TRADITIONAL },
+  { "mozc-dv", IDS_LANGUAGES_MEDIUM_LEN_NAME_JAPANESE },
+  { "mozc-hangul", IDS_LANGUAGES_MEDIUM_LEN_NAME_KOREAN },
+  { "mozc-jp", IDS_LANGUAGES_MEDIUM_LEN_NAME_JAPANESE },
+  { "pinyin", IDS_LANGUAGES_MEDIUM_LEN_NAME_CHINESE_SIMPLIFIED },
+  { "pinyin-dv", IDS_LANGUAGES_MEDIUM_LEN_NAME_CHINESE_SIMPLIFIED },
+};
+const size_t kMappingImeIdToMediumLenNameResourceIdLen =
+    ARRAYSIZE_UNSAFE(kMappingImeIdToMediumLenNameResourceId);
+
 string16 GetLanguageName(const std::string& language_code) {
   const string16 language_name = l10n_util::GetDisplayNameForLocale(
       language_code, g_browser_process->GetApplicationLocale(), true);
   return language_name;
 }
 
 }
 
 namespace chromeos {
 
@@ skipping 344 matching lines @@
   if (text.empty()) {
     const size_t kMaxLanguageNameLen = 2;
     const std::string language_code = input_method.language_code();
     text = StringToUpperASCII(UTF8ToUTF16(language_code)).substr(
         0, kMaxLanguageNameLen);
   }
   DCHECK(!text.empty());
   return text;
 }
 
+string16 InputMethodUtil::GetInputMethodMediumName(
+    const InputMethodDescriptor& input_method) const {
+  // For the "Your input method has changed to..." bubble. In most cases
+  // it uses the same name as the short name, unless found in a table
+  // for medium length names.
+  for (size_t i = 0; i < kMappingImeIdToMediumLenNameResourceIdLen; ++i) {
+    if (kMappingImeIdToMediumLenNameResourceId[i].input_method_id ==
+        input_method.id()) {
+      return l10n_util::GetStringUTF16(
+          kMappingImeIdToMediumLenNameResourceId[i].resource_id);
+    }
+  }
+  return GetInputMethodShortName(input_method);
+}
+
 string16 InputMethodUtil::GetInputMethodLongName(
     const InputMethodDescriptor& input_method) const {
   if (!input_method.name().empty()) {
     // If the descriptor has a name, use it.
     return UTF8ToUTF16(input_method.name());
   }
 
   // We don't show language here.  Name of keyboard layout or input method
   // usually imply (or explicitly include) its language.
 
@@ skipping 252 matching lines @@
   ReloadInternalMaps();
 }
 
 void InputMethodUtil::SetHardwareInputMethodIdForTesting(
     const std::string& input_method_id) {
   hardware_input_method_id_for_testing_ = input_method_id;
 }
 
 }  // namespace input_method
 }  // namespace chromeos