| Index: chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
|
| index 1ca9cf74d418e6a99fd085d9360f903528126227..2af7f8bb3c90a96adcb90d7e2294d20f6bd3cacf 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
|
| @@ -55,6 +55,12 @@ InputMethodEngineIBus::InputMethodEngineIBus()
|
| weak_ptr_factory_(this) {
|
| }
|
|
|
| +InputMethodEngineIBus::~InputMethodEngineIBus() {
|
| + GetCurrentService()->UnsetEngine();
|
| + input_method::InputMethodManager::GetInstance()->
|
| + RemoveInputMethodExtension(ibus_id_);
|
| +}
|
| +
|
| void InputMethodEngineIBus::Initialize(
|
| InputMethodEngine::Observer* observer,
|
| const char* engine_name,
|
| @@ -110,9 +116,6 @@ void InputMethodEngineIBus::Initialize(
|
| RegisterComponent();
|
| }
|
|
|
| -InputMethodEngineIBus::~InputMethodEngineIBus() {
|
| -}
|
| -
|
| bool InputMethodEngineIBus::SetComposition(
|
| int context_id,
|
| const char* text,
|
| @@ -571,7 +574,7 @@ void InputMethodEngineIBus::CreateEngineHandler(
|
| current_object_path_++;
|
| object_path_ = dbus::ObjectPath(kObjectPathPrefix +
|
| base::IntToString(current_object_path_));
|
| - GetCurrentService()->Initialize(this);
|
| + GetCurrentService()->SetEngine(this);
|
| sender.Run(object_path_);
|
| }
|
|
|
|
|