| 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 f72ec7d78f4d36b573fd8d8f9c5662cbb5496853..f6b906dd4d2caa67fb62704385c4476598796a77 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc
|
| @@ -66,6 +66,13 @@ InputMethodManagerImpl::InputMethodManagerImpl(
|
| keyboard_.reset(ImeKeyboard::Create());
|
| else
|
| keyboard_.reset(new FakeImeKeyboard());
|
| +
|
| + // Initializes the system IME list.
|
| + scoped_ptr<ComponentExtensionIMEManagerDelegate> comp_delegate(
|
| + new ComponentExtensionIMEManagerImpl());
|
| + component_extension_ime_manager_->Initialize(comp_delegate.Pass());
|
| + util_.ResetInputMethods(
|
| + component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor());
|
| }
|
|
|
| InputMethodManagerImpl::~InputMethodManagerImpl() {
|
| @@ -796,15 +803,6 @@ ComponentExtensionIMEManager*
|
| return component_extension_ime_manager_.get();
|
| }
|
|
|
| -void InputMethodManagerImpl::InitializeComponentExtension() {
|
| - scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate(
|
| - new ComponentExtensionIMEManagerImpl());
|
| - component_extension_ime_manager_->Initialize(delegate.Pass());
|
| -
|
| - util_.ResetInputMethods(
|
| - component_extension_ime_manager_->GetAllIMEAsInputMethodDescriptor());
|
| -}
|
| -
|
| void InputMethodManagerImpl::SetCandidateWindowControllerForTesting(
|
| CandidateWindowController* candidate_window_controller) {
|
| candidate_window_controller_.reset(candidate_window_controller);
|
|
|