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

chrome/browser/ui/webui/chromeos/login/network_screen_handler.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/ui/webui/chromeos/login/network_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/input_events_blocker.h"
 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
@@ skipping 343 matching lines @@
 }
 
 // static
 base::ListValue* NetworkScreenHandler::GetInputMethods() {
   base::ListValue* input_methods_list = new base::ListValue;
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
   scoped_ptr<input_method::InputMethodDescriptors> input_methods(
       manager->GetActiveInputMethods());
-  std::string current_input_method_id = manager->GetCurrentInputMethod().id();
+  // Uses extension_ime_util::MaybeGetLegacyXkbId() to make sure the input
+  // method id is in legacy xkb id format (e.g. xkb:us::eng), instead of
+  // extension based xkd id format (e.g. _comp_ime_...xkb:us::eng).
+  // Same for the rests.
+  // TODO(shuchen): support wait for component extension loading, and then show
+  // OOBE window. So that extension_ime_util::MaybeGetLegacyXkbId() can be
+  // removed.
+  std::string current_input_method_id = extension_ime_util::MaybeGetLegacyXkbId(
+      manager->GetCurrentInputMethod().id());
   const std::vector<std::string>& hardware_login_input_methods =
       util->GetHardwareLoginInputMethodIds();
   std::set<std::string> input_methods_added;
 
   for (std::vector<std::string>::const_iterator i =
            hardware_login_input_methods.begin();
        i != hardware_login_input_methods.end();
        ++i) {
-    input_methods_added.insert(*i);
+    // Makes sure the id is in legacy xkb id format.
+    const std::string id = extension_ime_util::MaybeGetLegacyXkbId(*i);
+    input_methods_added.insert(id);
     const input_method::InputMethodDescriptor* ime =
-        util->GetInputMethodDescriptorFromId(*i);
+        util->GetInputMethodDescriptorFromId(id);
     DCHECK(ime != NULL);
     // Do not crash in case of misconfiguration.
     if (ime != NULL) {
       input_methods_list->Append(
           CreateInputMethodsEntry(*ime, current_input_method_id));
     }
   }
 
   bool optgroup_added = false;
   for (size_t i = 0; i < input_methods->size(); ++i) {
-    const std::string& ime_id = input_methods->at(i).id();
+    // Makes sure the id is in legacy xkb id format.
+    const std::string& ime_id = extension_ime_util::MaybeGetLegacyXkbId(
+        input_methods->at(i).id());

[Yuki, 2014/03/04 04:04:45]

Please do not use std::vector::at() even though the original code used it.

[Shu Chen, 2014/03/04 04:45:02]

Done.

     if (!InsertString(ime_id, input_methods_added))
       continue;
     if (!optgroup_added) {
       optgroup_added = true;
       AddOptgroupOtherLayouts(input_methods_list);
     }
     input_methods_list->Append(
         CreateInputMethodsEntry(input_methods->at(i), current_input_method_id));

[Yuki, 2014/03/04 04:04:45]

Please change this line, too.  Using std::vector::at() doesn't comply with our
policy that we don't use exceptions or exception handling in our codebase.

[Shu Chen, 2014/03/04 04:45:02]

Done.

   }
   // "xkb:us::eng" should always be in the list of available layouts.
   if (input_methods_added.count(kUSlayout) == 0) {
     const input_method::InputMethodDescriptor* us_eng_descriptor =
         util->GetInputMethodDescriptorFromId(kUSlayout);
     DCHECK(us_eng_descriptor != NULL);
     if (!optgroup_added) {
       optgroup_added = true;
       AddOptgroupOtherLayouts(input_methods_list);
     }
@@ skipping 25 matching lines @@
     timezone_option->SetString("value", timezone_id);
     timezone_option->SetString("title", timezone_name);
     timezone_option->SetBoolean("selected", timezone_id == current_timezone_id);
     timezone_list->Append(timezone_option.release());
   }
 
   return timezone_list.release();
 }
 
 }  // namespace chromeos