Sync starting language and input method preferences

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 92 matching lines @@
   return StartsWithASCII(input_method_id,
                          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)
+std::string GetEngineIDByInputMethodID(const std::string& input_method_id) {
+  if (!IsComponentExtensionIME(input_method_id))
+    return input_method_id;
+

[Shu Chen, 2014/07/02 02:29:04]

just do:

return input_method_id.substr(kComponentExtensionIMEPrefixLength +
kExtensionIdLength);

[michaelpg, 2014/07/10 00:46:01]

Done.

+  size_t pos = std::string::npos;
+  if (IsKeyboardLayoutExtension(input_method_id))
+    pos = input_method_id.find("xkb:");
+  else
+    pos = input_method_id.find(kComponentExtensionIMEPrefix);
+
+  if (pos != std::string::npos)
       return input_method_id.substr(pos);
-  }
   return input_method_id;
 }
 
+std::string MaybeGetLegacyXkbId(const std::string& input_method_id) {
+  if (IsKeyboardLayoutExtension(input_method_id))
+    return GetEngineIDByInputMethodID(input_method_id);
+  return input_method_id;
+}
+
 }  // namespace extension_ime_util
 }  // namespace chromeos