| Index: chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
| index 8fda319f81d34e72e41f833899cd88e2ca259a6f..25c0b9c21ffba7f8667a26e4cc246147395f4e4d 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
| @@ -50,6 +50,11 @@ bool InputMethodManagerImpl::IsLoginKeyboard(
|
| return util_.IsLoginKeyboard(layout);
|
| }
|
|
|
| +bool InputMethodManagerImpl::MigrateXkbInputMethods(
|
| + std::vector<std::string>* input_method_ids) {
|
| + return util_.MigrateXkbInputMethods(input_method_ids);
|
| +}
|
| +
|
| InputMethodManagerImpl::InputMethodManagerImpl(
|
| scoped_ptr<InputMethodDelegate> delegate)
|
| : delegate_(delegate.Pass()),
|
| @@ -319,8 +324,10 @@ bool InputMethodManagerImpl::ChangeInputMethodInternal(
|
| }
|
| }
|
|
|
| - if (!component_extension_ime_manager_->IsInitialized() &&
|
| - !InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch)) {
|
| + if (!component_extension_ime_manager_->IsInitialized() && (
|
| + !InputMethodUtil::IsKeyboardLayout(input_method_id_to_switch) ||
|
| + extension_ime_util::IsKeyboardLayoutExtension(
|
| + input_method_id_to_switch))) {
|
| // We can't change input method before the initialization of
|
| // component extension ime manager. ChangeInputMethod will be
|
| // called with |pending_input_method_| when the initialization is
|
|
|