Migrates Japanese IME IDs and stop migrating Chinese IME IDs.

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 18 matching lines @@
 
 // A mapping from an input method id to a string for the language indicator. The
 // mapping is necessary since some input methods belong to the same language.
 // For example, both "xkb:us::eng" and "xkb:us:dvorak:eng" are for US English.
 const struct {
   const char* input_method_id;
   const char* indicator_text;
 } kMappingFromIdToIndicatorText[] = {
   // To distinguish from "xkb:jp::jpn"
   // TODO(nona): Make following variables configurable. http://crbug.com/232260.
-  { "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us", "\xe3\x81\x82" },
-  { "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_jp", "\xe3\x81\x82" },
+  { "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopnacl_mozc_us", "\xe3\x81\x82" },
+  { "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopnacl_mozc_jp", "\xe3\x81\x82" },
   { "_comp_ime_bbaiamgfapehflhememkfglaehiobjnknacl_mozc_us", "\xe3\x81\x82" },
   { "_comp_ime_bbaiamgfapehflhememkfglaehiobjnknacl_mozc_jp", "\xe3\x81\x82" },
   // For simplified Chinese input methods
   { "pinyin", "\xe6\x8b\xbc" },  // U+62FC
   { "_comp_ime_cpgalbafkoofkjmaeonnfijgpfennjjnzh-t-i0-pinyin",
     "\xe6\x8b\xbc" },
   { "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopzh-t-i0-pinyin",
     "\xe6\x8b\xbc" },
   { "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopzh-t-i0-wubi-1986",
     "\xe4\xba\x94" }, // U+4E94
@@ skipping 66 matching lines @@
 
 // Due to asynchronous initialization of component extension manager,
 // GetFirstLogingInputMethodIds may miss component extension IMEs. To enable
 // component extension IME as the first loging input method, we have to prepare
 // component extension IME IDs.
 const struct {
   const char* locale;
   const char* layout;
   const char* input_method_id;
 } kDefaultInputMethodRecommendation[] = {
-  { "ja", "us", "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_us" },
-  { "ja", "jp", "_comp_ime_fpfbhcjppmaeaijcidgiibchfbnhbeljnacl_mozc_jp" },
+  { "ja", "us", "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopnacl_mozc_us" },
+  { "ja", "jp", "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopnacl_mozc_jp" },
   { "zh-CN", "us", "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopzh-t-i0-pinyin" },
   { "zh-TW", "us",
     "_comp_ime_gjaehgfemfahhmlgpdfknkhdnemmolopzh-hant-t-i0-und" },
 #if defined(OFFICIAL_BUILD)
   { "th", "us", "_comp_ime_habcdindjejkmepknlhkkloncjcpcnbfvkd_th" },
   { "vi", "us", "_comp_ime_habcdindjejkmepknlhkkloncjcpcnbfvkd_vi_tcvn" },
   { "vi", "us", "_comp_ime_habcdindjejkmepknlhkkloncjcpcnbfvkd_vi_tcvn" },
 #else
   { "th", "us", "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_th" },
   { "vi", "us", "_comp_ime_jhffeifommiaekmbkkjlpmilogcfdohpvkd_vi_tcvn" },
@@ skipping 49 matching lines @@
                                          {"si", "SI"},
                                          {"sk", "SK"},
                                          {"tr", "TR"},
                                          {"ua", "UA"},
                                          {"us", "US"},
                                          {"us(altgr-intl)", "EXTD"},
                                          {"us(colemak)", "CO"},
                                          {"us(dvorak)", "DV"},
                                          {"us(intl)", "INTL"}, };
 
-// The old chinese input method ids for migration.
-// See crbug.com/357384.
-const char* kOldChineseExtensionIds[] = {
-  "goedamlknlnjaengojinmfgpmdjmkooo",
-  "nmblnjkfdkabgdofidlkienfnnbjhnab",
-  "gjhclobljhjhgoebiipblnmdodbmpdgd"
+// The extension ID map for migration.
+const char* const kExtensionIdMigrationMap[][2] = {
+  // Official Japanese IME extension ID.
+  {"fpfbhcjppmaeaijcidgiibchfbnhbelj", "gjaehgfemfahhmlgpdfknkhdnemmolop"},
 };
 
-// The new chinese input method id for migration.
-// See crbug.com/357384.
-const char* kNewChineseExtensionId = "gjaehgfemfahhmlgpdfknkhdnemmolop";
-
 const size_t kExtensionIdLen = 32;
 
 }  // namespace
 
 namespace chromeos {
 
 extern const char* kExtensionImePrefix;
 
 namespace input_method {
 
@@ skipping 482 matching lines @@
     const std::string& language_code) {
   std::vector<std::string> candidates;
   GetInputMethodIdsFromLanguageCode(
       language_code, input_method::kKeyboardLayoutsOnly, &candidates);
   if (candidates.size())
     return candidates.front();
 
   return std::string();
 }
 
-bool InputMethodUtil::MigrateXkbInputMethods(
+bool InputMethodUtil::MigrateInputMethods(
     std::vector<std::string>* input_method_ids) {
   bool rewritten = false;
   std::vector<std::string>& ids = *input_method_ids;
   for (size_t i = 0; i < ids.size(); ++i) {
     std::string id =
         extension_ime_util::GetInputMethodIDByKeyboardLayout(ids[i]);
-    // Migrates the old chinese ime id to new ones.
-    // TODO(shuchen): Change the function name to MigrateInputMethods,
-    // and create an abstract layer to map a comprehensive input method id to
-    // the real extension based input method id.
-    // e.g. "zh-t-i0-pinyin" maps to
-    // "_comp_id_gjaehgfemfahhmlgpdfknkhdnemmolopzh-t-i0-pinyin".
-    // See crbug.com/358083.
-    for (size_t j = 0; j < arraysize(kOldChineseExtensionIds); ++j) {
-      size_t pos = id.find(kOldChineseExtensionIds[j]);
-      if (pos != std::string::npos) {
-        id.replace(pos, kExtensionIdLen, kNewChineseExtensionId);
-        break;
+    // Migrates old ime id's to new ones.
+    for (size_t j = 0; j < arraysize(kExtensionIdMigrationMap); ++j) {
+      size_t pos = id.find(kExtensionIdMigrationMap[j][0]);
+      if (pos != std::string::npos)
+        id.replace(pos, kExtensionIdLen, kExtensionIdMigrationMap[j][1]);
+      if (id != ids[i]) {
+        ids[i] = id;
+        rewritten = true;
       }
     }
-    if (id != ids[i]) {
-      ids[i] = id;
-      rewritten = true;
-    }
   }
   if (rewritten) {
     // Removes the duplicates.
     std::vector<std::string> new_ids;
     for (size_t i = 0; i < ids.size(); ++i) {
       if (std::find(new_ids.begin(), new_ids.end(), ids[i]) == new_ids.end())
         new_ids.push_back(ids[i]);
     }
     ids.swap(new_ids);
   }
   return rewritten;
 }
 
 void InputMethodUtil::UpdateHardwareLayoutCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   hardware_layouts_.clear();
   hardware_login_layouts_.clear();
   if (cached_hardware_layouts_.empty())
     Tokenize(delegate_->GetHardwareKeyboardLayouts(), ",",
              &cached_hardware_layouts_);
   hardware_layouts_ = cached_hardware_layouts_;
-  MigrateXkbInputMethods(&hardware_layouts_);
+  MigrateInputMethods(&hardware_layouts_);
 
   for (size_t i = 0; i < hardware_layouts_.size(); ++i) {
     if (IsLoginKeyboard(hardware_layouts_[i]))
       hardware_login_layouts_.push_back(hardware_layouts_[i]);
   }
   if (hardware_layouts_.empty()) {
     // This is totally fine if it's empty. The hardware keyboard layout is
     // not stored if startup_manifest.json (OEM customization data) is not
     // present (ex. Cr48 doen't have that file).
     hardware_layouts_.push_back(GetFallbackInputMethodDescriptor().id());
@@ skipping 130 matching lines @@
           std::make_pair(language_codes[i], input_method_id));
       // Remember the pairs.
       id_to_language_code_.insert(
           std::make_pair(input_method_id, language_codes[i]));
     }
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos