Refactoring for InputMethodEngine and InputMethodEventRouter.

chromeos/ime/extension_ime_util.cc

 // Copyright 2013 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 "chromeos/ime/extension_ime_util.h"
 
 #include "base/strings/string_util.h"
 
 namespace chromeos {
 
@@ skipping 36 matching lines @@
   }
   if (IsComponentExtensionIME(input_method_id) &&
       input_method_id.size() >= kComponentExtensionIMEPrefixLength +
                                 kExtensionIdLength) {
     return input_method_id.substr(kComponentExtensionIMEPrefixLength,
                                   kExtensionIdLength);
   }
   return "";
 }
 
+std::string GetEngineIDByInputMethodID(const std::string& input_method_id) {
+  if (IsComponentExtensionIME(input_method_id))
+    return input_method_id.substr(kComponentExtensionIMEPrefixLength +
+                                  kExtensionIdLength);
+  if (IsExtensionIME(input_method_id))
+    return input_method_id.substr(kExtensionIMEPrefixLength +
+                                  kExtensionIdLength);
+  return input_method_id;
+}
+
 std::string GetInputMethodIDByEngineID(const std::string& engine_id) {
   if (StartsWithASCII(engine_id, kComponentExtensionIMEPrefix, true) ||
       StartsWithASCII(engine_id, kExtensionIMEPrefix, true)) {
     return engine_id;
   }
   if (StartsWithASCII(engine_id, "xkb:", true))
     return GetComponentInputMethodID(kXkbExtensionId, engine_id);
   if (StartsWithASCII(engine_id, "vkd_", true))
     return GetComponentInputMethodID(kM17nExtensionId, engine_id);
   if (StartsWithASCII(engine_id, "nacl_mozc_", true))
@@ skipping 37 matching lines @@
                          kExtensionIMEPrefix + extension_id,
                          true);  // Case sensitive.
 }
 
 bool IsKeyboardLayoutExtension(const std::string& input_method_id) {
   std::string prefix = kComponentExtensionIMEPrefix;
   return StartsWithASCII(input_method_id, prefix + kXkbExtensionId, true);
 }
 
 std::string MaybeGetLegacyXkbId(const std::string& input_method_id) {
-  if (IsKeyboardLayoutExtension(input_method_id)) {
-    size_t pos = input_method_id.find("xkb:");
-    if (pos != std::string::npos)
-      return input_method_id.substr(pos);
-  }
+  if (IsKeyboardLayoutExtension(input_method_id))
+    return GetEngineIDByInputMethodID(input_method_id);
   return input_method_id;
 }
 
 }  // namespace extension_ime_util
 }  // namespace chromeos