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

chrome/browser/chromeos/input_method/input_method_util.cc

Index: chrome/browser/chromeos/input_method/input_method_util.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index e11dd25e34e545c664398cb4c900c5e7b21f1c90..31f30e6b645be444c8f08b199cafde3ebb4eef96 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -611,11 +611,26 @@ std::string InputMethodUtil::GetLanguageDefaultInputMethodId(
   return std::string();
 }
 
+bool InputMethodUtil::MigrateXkbInputMethods(
+    std::vector<std::string>* input_method_ids) {
+  bool rewritten = false;
+  for (size_t i = 0; i < input_method_ids->size(); ++i) {
+    if (IsKeyboardLayout(input_method_ids->at(i))) {

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

Why at(i)?  You already checked the range.

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

IsKeyboardLayout() returns almost always true doesn't it?  |input_method_ids[i]|
should be "xkb:..." or component extention id, and then IsKeyboardLayout()
returns true.

So, if the input is valid, MigrateXkbInputMethods always returns true regardless
of whether it actually updated the content or not.

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

Please notice that Preferences::SetLanguageConfigStringListAsCSV() will pass in
any input method IDs (from user preferences) as input_method_ids.

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

Notice that input_method_ids is a pointer: std::vector<std::string>*, instead of
std::vector<std::string>.

But anyway, I've changed it to a reference instead of a pointer.

+      input_method_ids->at(i).assign(

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

input_method_ids[i] = ...
has the same effect and would be much more common.

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

Notice that input_method_ids is a pointer: std::vector<std::string>*, instead of
std::vector<std::string>.

But anyway, I've changed it to a reference instead of a pointer.

+          extension_ime_util::GetInputMethodIDByKeyboardLayout(
+              input_method_ids->at(i)));
+      rewritten = true;
+    }
+  }
+  return rewritten;
+}
+
 void InputMethodUtil::UpdateHardwareLayoutCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   hardware_layouts_.clear();
   hardware_login_layouts_.clear();
   Tokenize(delegate_->GetHardwareKeyboardLayouts(), ",", &hardware_layouts_);
+  MigrateXkbInputMethods(&hardware_layouts_);
 
   for (size_t i = 0; i < hardware_layouts_.size(); ++i) {
     if (IsLoginKeyboard(hardware_layouts_[i]))
@@ -682,14 +697,15 @@ InputMethodDescriptor InputMethodUtil::GetFallbackInputMethodDescriptor() {
   layouts.push_back("us");
   std::vector<std::string> languages;
   languages.push_back("en-US");
-  return InputMethodDescriptor("xkb:us::eng",
-                               "",
-                               "US",
-                               layouts,
-                               languages,
-                               true,  // login keyboard.
-                               GURL(),  // options page, not available.
-                               GURL()); // input view page, not available.
+  return InputMethodDescriptor(
+      extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:us::eng"),
+      "",
+      "US",
+      layouts,
+      languages,
+      true,  // login keyboard.
+      GURL(),  // options page, not available.
+      GURL()); // input view page, not available.
 }
 
 void InputMethodUtil::ReloadInternalMaps() {