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 43 matching lines @@
   { "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 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 char* medium_length_name;
+} kMappintFromIdToMediumLengthName[] = {

[Daniel Erat, 2012/09/24 20:48:00]

s/Mappint/Mapping/

[sschmitz, 2012/09/24 21:28:16]

OMG (wrong in several locations). Great eyes. 
Done.

+  { "mozc", "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e" },
+  { "mozc-dv", "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e" },
+  { "mozc-jp", "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e" },
+  { "zinnia-japanese", "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e" },
+};
+const size_t kMappintFromIdToMediumLengthNameLen =
+    ARRAYSIZE_UNSAFE(kMappintFromIdToMediumLengthName);
+
 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 304 matching lines @@
     const std::string& input_method_id) const {
   string16 display_name;
   if (!IsExtensionInputMethod(input_method_id) &&
       TranslateStringInternal(input_method_id, &display_name)) {
     return UTF16ToUTF8(display_name);
   }
   // Return an empty string if the display name is not found.
   return "";
 }
 
+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 < kMappintFromIdToMediumLengthNameLen; ++i) {
+    if (kMappintFromIdToMediumLengthName[i].input_method_id ==
+        input_method.id())
+      return
+          UTF8ToUTF16(kMappintFromIdToMediumLengthName[i].medium_length_name);
+  }
+  return GetInputMethodShortName(input_method);
+}
+
 string16 InputMethodUtil::GetInputMethodShortName(
     const InputMethodDescriptor& input_method) const {
   // For the status area, we use two-letter, upper-case language code like
   // "US" and "JP".
   string16 text;
 
   // Check special cases first.
   for (size_t i = 0; i < kMappingFromIdToIndicatorTextLen; ++i) {
     if (kMappingFromIdToIndicatorText[i].input_method_id == input_method.id()) {
       text = UTF8ToUTF16(kMappingFromIdToIndicatorText[i].indicator_text);
@@ skipping 292 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