2 files changed, 4 insertions, 3 deletions
diff --git a/chromeos/ime/component_extension_ime_manager.cc b/chromeos/ime/component_extension_ime_manager.cc
index e39537a..d34ef19 100644
--- a/chromeos/ime/component_extension_ime_manager.cc
+++ b/chromeos/ime/component_extension_ime_manager.cc
@@ -203,8 +203,8 @@ input_method::InputMethodDescriptors
               // Enables extension based xkb keyboards on login screen.
               extension_ime_util::IsKeyboardLayoutExtension(
                   input_method_id) && IsInLoginLayoutWhitelist(layouts),
-              component_extension_imes_[i].options_page_url,
-              component_extension_imes_[i].input_view_url));
+              component_extension_imes_[i].engines[j].options_page_url,
+              component_extension_imes_[i].engines[j].input_view_url));
     }
   }
   return result;
diff --git a/chromeos/ime/component_extension_ime_manager.h b/chromeos/ime/component_extension_ime_manager.h
index bc26ec6..11f113f 100644
--- a/chromeos/ime/component_extension_ime_manager.h
+++ b/chromeos/ime/component_extension_ime_manager.h
@@ -24,6 +24,8 @@ struct CHROMEOS_EXPORT ComponentExtensionEngine {
   std::vector<std::string> language_codes;  // The engine's language(ex. "en").
   std::string description;  // The engine description.
   std::vector<std::string> layouts;  // The list of keyboard layout of engine.
+  GURL options_page_url; // an URL to option page.
+  GURL input_view_url; // an URL to input view page.
 };
 
 // Represents a component extension IME.
@@ -34,7 +36,6 @@ struct CHROMEOS_EXPORT ComponentExtensionIME {
   std::string manifest;  // the contents of manifest.json
   std::string description;  // description of extension.
   GURL options_page_url; // an URL to option page.
-  GURL input_view_url; // an URL to input view page.
   base::FilePath path;
   std::vector<ComponentExtensionEngine> engines;
 };