Commit 933a9206 authored by komatsu@chromium.org's avatar komatsu@chromium.org

Enable to show input mode indicator with keyboard layout only input methods.

This match enables to initialize the input mode indicator when multiple input methods are available.

BUG=315007

Review URL: https://codereview.chromium.org/59413002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233514 0039d316-1c4b-4281-b951-d872f2087c98
parent 180ef24f
...@@ -215,15 +215,17 @@ void InputMethodManagerImpl::ReconfigureIMFramework() { ...@@ -215,15 +215,17 @@ void InputMethodManagerImpl::ReconfigureIMFramework() {
if (component_extension_ime_manager_->IsInitialized()) if (component_extension_ime_manager_->IsInitialized())
LoadNecessaryComponentExtensions(); LoadNecessaryComponentExtensions();
if (ContainsOnlyKeyboardLayout(active_input_method_ids_)) { const bool need_engine =
// Do NOT call ibus_controller_->Stop(); here to work around a crash issue !ContainsOnlyKeyboardLayout(active_input_method_ids_);
// at crbug.com/27051.
// TODO(yusukes): We can safely call Stop(); here once crbug.com/26443 // Initialize candidate window controller and widgets such as
// is implemented. // candidate window, infolist and mode indicator. Note, mode
} else { // indicator is used by only keyboard layout input methods.
if (need_engine || active_input_method_ids_.size() > 1)
MaybeInitializeCandidateWindowController(); MaybeInitializeCandidateWindowController();
if (need_engine)
IBusDaemonController::GetInstance()->Start(); IBusDaemonController::GetInstance()->Start();
}
} }
bool InputMethodManagerImpl::EnableInputMethod( bool InputMethodManagerImpl::EnableInputMethod(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment