Chromium Code Reviews| Index: chromeos/ime/component_extension_ime_manager.cc |
| diff --git a/chromeos/ime/component_extension_ime_manager.cc b/chromeos/ime/component_extension_ime_manager.cc |
| index 7c13f5aa064e61a48f2c1e825c78d6ed39f584d3..b31470b52089e1fb9d39477b89327f2b5ff435d2 100644 |
| --- a/chromeos/ime/component_extension_ime_manager.cc |
| +++ b/chromeos/ime/component_extension_ime_manager.cc |
| @@ -130,16 +130,19 @@ input_method::InputMethodDescriptors |
| input_method::InputMethodDescriptors result; |
| for (size_t i = 0; i < component_extension_imes_.size(); ++i) { |
| for (size_t j = 0; j < component_extension_imes_[i].engines.size(); ++j) { |
| + const std::string input_method_id = |
| + extension_ime_util::GetComponentInputMethodID( |
| + component_extension_imes_[i].id, |
| + component_extension_imes_[i].engines[j].engine_id); |
| result.push_back( |
| input_method::InputMethodDescriptor( |
| - extension_ime_util::GetComponentInputMethodID( |
| - component_extension_imes_[i].id, |
| - component_extension_imes_[i].engines[j].engine_id), |
| + input_method_id, |
| component_extension_imes_[i].engines[j].display_name, |
| std::string(), // TODO(uekawa): Set short name. |
| component_extension_imes_[i].engines[j].layouts, |
| component_extension_imes_[i].engines[j].language_codes, |
| - false, // Do not use IME on login screen. |
| + // Enables extension based xkb keyboards on login screen. |
| + extension_ime_util::IsKeyboardLayoutExtension(input_method_id), |
|
Seigo Nonaka
2014/02/25 06:57:19
Please making sure you can change layout on login/
Shu Chen
2014/02/25 08:52:51
Verified it works at login/lock screen.
|
| component_extension_imes_[i].options_page_url, |
| component_extension_imes_[i].input_view_url)); |
| } |