[IME] migrate the xkb ID to extension based xkb ID.

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 {
 namespace {
@@ skipping 34 matching lines @@
   }
   if (IsComponentExtensionIME(input_method_id) &&
       input_method_id.size() >= kComponentExtensionIMEPrefixLength +
                                 kExtensionIdLength) {
     return input_method_id.substr(kComponentExtensionIMEPrefixLength,
                                   kExtensionIdLength);
   }
   return "";
 }
 
+std::string GetInputMethodIDByKeyboardLayout(
+    const std::string& keyboard_layout_id) {
+  if (IsKeyboardLayoutExtension(keyboard_layout_id))
+    return keyboard_layout_id;
+  return kExtensionXkbIdPrefix + keyboard_layout_id;

[Yuki, 2014/02/27 02:40:33]

I think it would be safer to DCHECK(keyboard_layout_id starts with "xkb:");

[Shu Chen, 2014/02/27 03:12:12]

The passed in keyboard_layout_id could be a new extension-based xkb id.
It would be safer to let this function handle that.

+}
+
 bool IsExtensionIME(const std::string& input_method_id) {
   return StartsWithASCII(input_method_id,
                          kExtensionIMEPrefix,
                          true);  // Case sensitive.
 }
 
 bool IsComponentExtensionIME(const std::string& input_method_id) {
   return StartsWithASCII(input_method_id,
                          kComponentExtensionIMEPrefix,
                          true);  // Case sensitive.
 }
 
 bool IsMemberOfExtension(const std::string& input_method_id,
                          const std::string& extension_id) {
   return StartsWithASCII(input_method_id,
                          kExtensionIMEPrefix + extension_id,
                          true);  // Case sensitive.
 }
 
 bool IsKeyboardLayoutExtension(const std::string& input_method_id) {
   return StartsWithASCII(input_method_id, kExtensionXkbIdPrefix, true);
 }
 
 }  // namespace extension_ime_util
 }  // namespace chromeos