Chromium Code Reviews| Index: chrome/browser/chromeos/cros/input_method_library.cc |
| diff --git a/chrome/browser/chromeos/cros/input_method_library.cc b/chrome/browser/chromeos/cros/input_method_library.cc |
| index c62c3fdc2248312154e14f60d0a584a958ef3bbd..72960f10a3077be0c9f63559748c50846ed2cfd4 100644 |
| --- a/chrome/browser/chromeos/cros/input_method_library.cc |
| +++ b/chrome/browser/chromeos/cros/input_method_library.cc |
| @@ -578,11 +578,19 @@ class InputMethodLibraryImpl : public InputMethodLibrary, |
| // actually changes the XKB layout will not be called. |
| CrosLibrary::Get()->GetKeyboardLibrary()->SetCurrentKeyboardLayoutByName( |
| chromeos::input_method::GetKeyboardLayoutName(xkb_engine_name)); |
| - kill(ibus_daemon_process_id_, SIGTERM); |
| + if (!chromeos::StopInputMethodProcess(input_method_status_connection_)) { |
| + LOG(ERROR) << "StopInputMethodProcess IPC failed. Sending SIGTERM to " |
| + << "PID " << ibus_daemon_process_id_; |
| + kill(ibus_daemon_process_id_, SIGTERM); |
| + } |
| + LOG(INFO) << "ibus-daemon (PID=" << ibus_daemon_process_id_ << ") is " |
|
satorux1
2011/01/11 07:02:30
Use of LOG(INFO) is discouraged. VLOG(1) would be
Yusuke Sato
2011/01/11 07:51:01
Done.
|
| + << "terminated"; |
| ibus_daemon_process_id_ = 0; |
| } |
| if (candidate_window_process_id_) { |
| kill(candidate_window_process_id_, SIGTERM); |
| + LOG(INFO) << "candidate_window (PID=" << candidate_window_process_id_ |
|
satorux1
2011/01/11 07:02:30
ditto
Yusuke Sato
2011/01/11 07:51:01
Done.
|
| + << ") is terminated"; |
| candidate_window_process_id_ = 0; |
| } |
| } |