Remove ibus dependency from IBusBus related stuff.

chrome/browser/chromeos/input_method/ibus_controller_impl.cc

 // Copyright (c) 2012 The Chromium 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 "chrome/browser/chromeos/input_method/ibus_controller_impl.h"
 
 #include <algorithm>  // for std::reverse.
 #include <cstdio>
 #include <cstring>  // for std::strcmp.
 #include <set>
 #include <sstream>
 #include <stack>
 #include <utility>
 
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/files/file_path_watcher.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/input_method/input_method_config.h"
 #include "chrome/browser/chromeos/input_method/input_method_property.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_config_client.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/ime/input_method_ibus.h"
 
 // TODO(nona): Remove libibus dependency from this file. Then, write unit tests
 // for all functions in this file. crbug.com/26334
@@ skipping 477 matching lines @@
 bool IBusControllerImpl::Stop() {
   if (ibus_daemon_status_ == IBUS_DAEMON_SHUTTING_DOWN ||
       ibus_daemon_status_ == IBUS_DAEMON_STOP) {
     return true;
   }
 
   ibus_daemon_status_ = IBUS_DAEMON_SHUTTING_DOWN;
   // TODO(nona): Shutdown ibus-bus connection.
   if (IBusConnectionsAreAlive()) {
     // Ask IBus to exit *asynchronously*.
-    ibus_bus_exit_async(ibus_,
-                        FALSE  /* do not restart */,
-                        -1  /* timeout */,
-                        NULL  /* cancellable */,
-                        NULL  /* callback */,
-                        NULL  /* user_data */);
+    IBusClient* client = DBusThreadManager::Get()->GetIBusClient();
+    if (client)
+      client->Exit(IBusClient::SHUT_DOWN_IBUS_DAEMON,
+                   base::Bind(&base::DoNothing));
   } else {
     base::KillProcess(process_handle_, -1, false /* wait */);
     DVLOG(1) << "Killing ibus-daemon. PID="
              << base::GetProcId(process_handle_);
   }
   process_handle_ = base::kNullProcessHandle;
   return true;
 }
 
 bool IBusControllerImpl::ChangeInputMethod(const std::string& id) {
@@ skipping 93 matching lines @@
 
   ibus_init();
   // Establish IBus connection between ibus-daemon to change the current input
   // method engine, properties, and so on.
   ibus_ = ibus_bus_new();
   DCHECK(ibus_);
 
   // Register callback functions for IBusBus signals.
   ConnectBusSignals();
 
-  // Ask libibus to watch the NameOwnerChanged signal *asynchronously*.
-  ibus_bus_set_watch_dbus_signal(ibus_, TRUE);
-
   if (ibus_bus_is_connected(ibus_)) {
     DVLOG(1) << "IBus connection is ready: ibus-daemon is already running?";
     BusConnected(ibus_);
   }
 }
 
 void IBusControllerImpl::SendChangeInputMethodRequest(const std::string& id) {
   // Change the global engine *asynchronously*.
-  ibus_bus_set_global_engine_async(ibus_,
-                                   id.c_str(),
-                                   -1,  // use the default ibus timeout
-                                   NULL,  // cancellable
-                                   NULL,  // callback
-                                   NULL);  // user_data
+  IBusClient* client = DBusThreadManager::Get()->GetIBusClient();
+  if (client)
+    client->SetGlobalEngine(id.c_str(), base::Bind(&base::DoNothing));
 }
 
 bool IBusControllerImpl::SetInputMethodConfigInternal(
     const ConfigKeyType& key,
     const InputMethodConfigValue& value) {
   IBusConfigClient* client = DBusThreadManager::Get()->GetIBusConfigClient();
   if (!client)
     return false;
 
   switch (value.type) {
@@ skipping 210 matching lines @@
     // Stop() or OnIBusDaemonExit() has already been called.
     return;
   }
   chromeos::DBusThreadManager::Get()->InitIBusBus(ibus_address);
   controller->ibus_daemon_status_ = IBUS_DAEMON_RUNNING;
 
   ui::InputMethodIBus* input_method_ibus = controller->GetInputMethod();
   DCHECK(input_method_ibus);
   input_method_ibus->OnConnected();
 
+  // Restores previous input method at the beggining of connection.
+  if (!controller->current_input_method_id_.empty()) {
+    controller->SendChangeInputMethodRequest(
+        controller->current_input_method_id_);
+  }
+
   DBusThreadManager::Get()->GetIBusConfigClient()->InitializeAsync(
       base::Bind(&IBusControllerImpl::OnIBusConfigClientInitialized,
                  controller->weak_ptr_factory_.GetWeakPtr()));
 
   FOR_EACH_OBSERVER(Observer, controller->observers_, OnConnected());
 
   VLOG(1) << "The ibus-daemon initialization is done.";
 }
 
 // static
@@ skipping 36 matching lines @@
 
 // static
 bool IBusControllerImpl::FindAndUpdatePropertyForTesting(
     const chromeos::input_method::InputMethodProperty& new_prop,
     chromeos::input_method::InputMethodPropertyList* prop_list) {
   return FindAndUpdateProperty(new_prop, prop_list);
 }
 
 }  // namespace input_method
 }  // namespace chromeos