Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(762)

Unified Diff: chrome/browser/chromeos/input_method/input_method_engine_ibus.cc

Issue 14404007: Fix crash on extension IME reloading on Linux Desktop with chromeos=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos/dbus/ibus/ibus_engine_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0e36d43325b661edfcd1096a05ab7735d4085d50..4ee01b948361246e4d95f7d0348250b1defd0b32 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
@@ -61,9 +61,13 @@ InputMethodEngineIBus::InputMethodEngineIBus()
}
InputMethodEngineIBus::~InputMethodEngineIBus() {
- if (object_path_.IsValid())
- GetCurrentService()->UnsetEngine();
input_method::GetInputMethodManager()->RemoveInputMethodExtension(ibus_id_);
+
+ // Do not unset engine before removing input method extension, above function
+ // may call reset function of engine object.
+ // TODO(nona): Call Reset manually here and remove relevant code from
+ // InputMethodManager once ibus-daemon is gone. (crbug.com/158273)
+ GetCurrentService()->UnsetEngine(this);
}
void InputMethodEngineIBus::Initialize(
« no previous file with comments | « no previous file | chromeos/dbus/ibus/ibus_engine_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698