Extends DBusThreadManager to connect ibus-bus.

chromeos/dbus/dbus_thread_manager.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 "chromeos/dbus/dbus_thread_manager.h"
 
 #include "base/chromeos/chromeos_version.h"
+#include "base/environment.h"
 #include "base/threading/thread.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_manager_client.h"
 #include "chromeos/dbus/bluetooth_node_client.h"
 #include "chromeos/dbus/cashew_client.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
@@ skipping 28 matching lines @@
     dbus_thread_->StartWithOptions(thread_options);
 
     // Create the connection to the system bus.
     dbus::Bus::Options system_bus_options;
     system_bus_options.bus_type = dbus::Bus::SYSTEM;
     system_bus_options.connection_type = dbus::Bus::PRIVATE;
     system_bus_options.dbus_thread_message_loop_proxy =
         dbus_thread_->message_loop_proxy();
     system_bus_ = new dbus::Bus(system_bus_options);
 
+    // Create the connection to the ibus bus.

[satorux1, 2012/04/23 23:09:21]

Is this the right place to connect to the ibus bus?

Shouldn't we connect to ibus-daemon only after we launch the ibus-daemon?

[Seigo Nonaka, 2012/04/24 00:37:58]

Ah yes!

Done.

On 2012/04/23 23:09:21, satorux1 wrote:

+    std::string ibus_address;
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    if (env->GetVar("IBUS_ADDRESS", &ibus_address)) {
+      dbus::Bus::Options ibus_bus_options;
+      ibus_bus_options.bus_type = dbus::Bus::CUSTOM_ADDRESS;
+      ibus_bus_options.address = ibus_address;
+      ibus_bus_options.connection_type = dbus::Bus::PRIVATE;
+      ibus_bus_options.dbus_thread_message_loop_proxy =
+          dbus_thread_->message_loop_proxy();
+      ibus_bus_ = new dbus::Bus(ibus_bus_options);
+      VLOG(1) << "Connected to ibus-daemon.(address:" << ibus_address << ")";
+    } else {
+      LOG(ERROR) << "Can not connect to ibus-daemon.";
+    }
+
     // Determine whether we use stub or real client implementations.
     const DBusClientImplementationType client_type =
         base::chromeos::IsRunningOnChromeOS() ?
         REAL_DBUS_CLIENT_IMPLEMENTATION : STUB_DBUS_CLIENT_IMPLEMENTATION;
 
     // Create the bluetooth clients.
     bluetooth_manager_client_.reset(BluetoothManagerClient::Create(
         client_type, system_bus_.get()));
     bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create(
         client_type, system_bus_.get(), bluetooth_manager_client_.get()));
@@ skipping 63 matching lines @@
     // Stop the D-Bus thread.
     dbus_thread_->Stop();
   }
 
   // DBusThreadManager override.
   virtual dbus::Bus* GetSystemBus() OVERRIDE {
     return system_bus_.get();
   }
 
   // DBusThreadManager override.
+  virtual dbus::Bus* GetIBusBus() OVERRIDE {
+    return ibus_bus_.get();
+  }
+
+  // DBusThreadManager override.
   virtual BluetoothAdapterClient* GetBluetoothAdapterClient() OVERRIDE {
     return bluetooth_adapter_client_.get();
   }
 
   // DBusThreadManager override.
   virtual BluetoothDeviceClient* GetBluetoothDeviceClient() OVERRIDE {
     return bluetooth_device_client_.get();
   }
 
   // DBusThreadManager override.
@@ skipping 91 matching lines @@
     return speech_synthesizer_client_.get();
   }
 
   // DBusThreadManager override.
   virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE {
     return update_engine_client_.get();
   }
 
   scoped_ptr<base::Thread> dbus_thread_;
   scoped_refptr<dbus::Bus> system_bus_;
+  scoped_refptr<dbus::Bus> ibus_bus_;
   scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
   scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
   scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
   scoped_ptr<BluetoothManagerClient> bluetooth_manager_client_;
   scoped_ptr<BluetoothNodeClient> bluetooth_node_client_;
   scoped_ptr<CashewClient> cashew_client_;
   scoped_ptr<CrosDisksClient> cros_disks_client_;
   scoped_ptr<CryptohomeClient> cryptohome_client_;
   scoped_ptr<DebugDaemonClient> debugdaemon_client_;
   scoped_ptr<FlimflamDeviceClient> flimflam_device_client_;
@@ skipping 51 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos