Add StopInputMethodProcess API which allows Chrome to terminate ibus-daemon in a nicer way than kill

chromeos_input_method.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos_input_method.h"
 #include "chromeos_input_method_whitelist.h"
 
 #include <ibusversion.h>
 
 #if !IBUS_CHECK_VERSION(1, 3, 99)
@@ skipping 12 matching lines @@
 #include "base/singleton.h"
 #if !IBUS_CHECK_VERSION(1, 3, 99)
 #include "chromeos/dbus/dbus.h"
 #include "chromeos/glib/object.h"
 #endif
 #include "ibus_input_methods.h"
 
 namespace {
 
 // TODO(yusukes): Remove all code for ibus-1.3 once we finish migrating to 1.4.
+// http://crosbug.com/10838
 #if !IBUS_CHECK_VERSION(1, 3, 99)
 #define ibus_engine_desc_get_name(d) ((d)->name)
 #define ibus_engine_desc_get_longname(d) ((d)->longname)
 #define ibus_engine_desc_get_layout(d) ((d)->layout)
 #define ibus_engine_desc_get_language(d) ((d)->language)
 
 const char kCandidateWindowService[] = "org.freedesktop.IBus.Panel";
 const char kCandidateWindowObjectPath[] = "/org/chromium/Chrome/LanguageBar";
 const char kCandidateWindowInterface[] = "org.freedesktop.IBus.Panel";
 #endif
@@ skipping 410 matching lines @@
 
   // Restores IBus and DBus connections if they are not ready.
   void MaybeRestoreConnections() {
     MaybeCreateIBus();
     MaybeRestoreIBusConfig();
 #if !IBUS_CHECK_VERSION(1, 3, 99)
     MaybeRestoreDBus();
 #endif
   }
 
+  // Called by cros API ChromeOSStopInputMethodProcess().
+  bool StopInputMethodProcess() {
+#if IBUS_CHECK_VERSION(1, 3, 99)
+    if (!IBusConnectionIsAlive()) {
+      LOG(ERROR) << "StopInputMethodProcess: IBus connection is not alive";
+      return false;
+    }
+    ibus_bus_exit(ibus_, FALSE /* do not restart */);
+    if (ibus_config_) {
+      // Release |ibus_config_| to make sure next IBusConnectionIsAlive() call
+      // will return false.
+      g_object_unref(ibus_config_);
+      ibus_config_ = NULL;
+    }
+    return true;
+#else
+    // For ibus-1.3, we don't implement the API and just return false since
+    // libcros's ibus-1.3 support will be removed soon. Chrome will use the
+    // kill system call to terminate the daemon.
+    return false;
+#endif
+  }
+
   // InputMethodType is used for GetInputMethods().
   enum InputMethodType {
     kActiveInputMethods,  // Get active input methods.
     kSupportedInputMethods,  // Get supported input methods.
   };
 
   // Called by cros API ChromeOSGet(Active|Supported)InputMethods().
   // Returns a list of input methods that are currently active or supported
   // depending on |mode|. Returns NULL on error.
   InputMethodDescriptors* GetInputMethods(InputMethodType type) {
@@ skipping 1151 matching lines @@
 }
 
 // TODO(yusukes): remove the function.
 extern "C"
 void ChromeOSDisconnectInputMethodStatus(
     InputMethodStatusConnection* connection) {
   LOG(INFO) << "DisconnectInputMethodStatus (NOP)";
 }
 
 extern "C"
+bool ChromeOSStopInputMethodProcess(InputMethodStatusConnection* connection) {
+  g_return_val_if_fail(connection, false);
+  return connection->StopInputMethodProcess();
+}
+
+extern "C"
 InputMethodDescriptors* ChromeOSGetActiveInputMethods(
     InputMethodStatusConnection* connection) {
   g_return_val_if_fail(connection, NULL);
   connection->MaybeRestoreConnections();
   // Pass ownership to a caller. Note: GetInputMethods() might return NULL.
   return connection->GetInputMethods(
       InputMethodStatusConnection::kActiveInputMethods);
 }
 
 extern "C"
@@ skipping 70 matching lines @@
     InputMethodStatusConnection* connection) {
   g_return_val_if_fail(connection, false);
   const bool is_connected = connection->IBusConnectionIsAlive();
   if (!is_connected) {
     LOG(WARNING) << "ChromeOSInputMethodStatusConnectionIsAlive: NOT alive";
   }
   return is_connected;
 }
 
 }  // namespace chromeos