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/command_line.h"
 #include "base/threading/thread.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 111 matching lines @@
         SpeechSynthesizerClient::Create(client_type, system_bus_.get()));
     // Create the update engine client.
     update_engine_client_.reset(
         UpdateEngineClient::Create(client_type, system_bus_.get()));
   }
 
   virtual ~DBusThreadManagerImpl() {
     // Shut down the bus. During the browser shutdown, it's ok to shut down
     // the bus synchronously.
     system_bus_->ShutdownOnDBusThreadAndBlock();
+    ibus_bus_->ShutdownOnDBusThreadAndBlock();

[satorux1, 2012/05/18 00:50:50]

This looks unsafe. ibus_bus_ is optional, right?

 Please do:

if (ibus_bus_.get())
  ibus_bus_->ShutdownOnDBusThreadAndBlock();

[Seigo Nonaka, 2012/05/18 01:00:48]

Yes, thanks.
On 2012/05/18 00:50:50, satorux1 wrote:

 
     // Stop the D-Bus thread.
     dbus_thread_->Stop();
   }
 
   // DBusThreadManager override.
+  virtual void InitIBusBus(const std::string &ibus_address) OVERRIDE {
+    DCHECK(!ibus_bus_);
+    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);
+    ibus_address_ = ibus_address;
+    VLOG(1) << "Connected to ibus-daemon.(address:" << ibus_address << ")";

[satorux1, 2012/05/18 00:50:50]

nit:

VLOG(1) << "Connected to ibus-daemon:" << ibus_address;

[Seigo Nonaka, 2012/05/18 01:00:48]

Done.

+  }
+
+  // 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_;
   scoped_ptr<FlimflamIPConfigClient> flimflam_ipconfig_client_;
   scoped_ptr<FlimflamManagerClient> flimflam_manager_client_;
   scoped_ptr<FlimflamNetworkClient> flimflam_network_client_;
   scoped_ptr<FlimflamProfileClient> flimflam_profile_client_;
   scoped_ptr<FlimflamServiceClient> flimflam_service_client_;
   scoped_ptr<GsmSMSClient> gsm_sms_client_;
   scoped_ptr<ImageBurnerClient> image_burner_client_;
   scoped_ptr<IntrospectableClient> introspectable_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
+
+  std::string ibus_address_;
 };
 
 // static
 void DBusThreadManager::Initialize() {
   if (g_dbus_thread_manager) {
     LOG(WARNING) << "DBusThreadManager was already initialized";
     return;
   }
   // Determine whether we use stub or real client implementations.
   if (base::chromeos::IsRunningOnChromeOS()) {
@@ skipping 45 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos