Delete IBusClient.

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 <map>
 
 #include "base/command_line.h"
 #include "base/observer_list.h"
 #include "base/sys_info.h"
 #include "base/threading/thread.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/bluetooth_adapter_client.h"
 #include "chromeos/dbus/bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/cras_audio_client.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/gsm_sms_client.h"
-#include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
 #include "chromeos/dbus/nfc_adapter_client.h"
 #include "chromeos/dbus/nfc_device_client.h"
 #include "chromeos/dbus/nfc_manager_client.h"
 #include "chromeos/dbus/nfc_record_client.h"
 #include "chromeos/dbus/nfc_tag_client.h"
 #include "chromeos/dbus/permission_broker_client.h"
 #include "chromeos/dbus/power_manager_client.h"
@@ skipping 52 matching lines @@
   virtual void AddObserver(DBusThreadManagerObserver* observer) OVERRIDE {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
   virtual void RemoveObserver(DBusThreadManagerObserver* observer) OVERRIDE {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
 
-  virtual void InitIBusBus(
-      const std::string &ibus_address,
-      const base::Closure& on_disconnected_callback) OVERRIDE {
-    ibus_client_.reset(IBusClient::Create());
-  }
-
   virtual dbus::Bus* GetSystemBus() OVERRIDE {
     return system_bus_.get();
   }
 
   virtual BluetoothAdapterClient* GetBluetoothAdapterClient() OVERRIDE {
     return bluetooth_adapter_client_.get();
   }
 
   virtual BluetoothAgentManagerClient* GetBluetoothAgentManagerClient()
       OVERRIDE {
@@ skipping 106 matching lines @@
   }
 
   virtual SystemClockClient* GetSystemClockClient() OVERRIDE {
     return system_clock_client_.get();
   }
 
   virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE {
     return update_engine_client_.get();
   }
 
-  virtual IBusClient* GetIBusClient() OVERRIDE {
-    return ibus_client_.get();
-  }
-
  private:
   // Constructs all clients -- stub or real implementation according to
   // |client_type| and |client_type_override| -- and stores them in the
   // respective *_client_ member variable.
   void CreateDefaultClients() {
     DBusClientImplementationType client_type = REAL_DBUS_CLIENT_IMPLEMENTATION;
     DBusClientImplementationType client_type_override =
         REAL_DBUS_CLIENT_IMPLEMENTATION;
     // If --dbus-stub was requested, pass STUB to specific components;
     // Many components like login are not useful with a stub implementation.
@@ skipping 81 matching lines @@
   scoped_ptr<NfcAdapterClient> nfc_adapter_client_;
   scoped_ptr<NfcDeviceClient> nfc_device_client_;
   scoped_ptr<NfcTagClient> nfc_tag_client_;
   scoped_ptr<NfcRecordClient> nfc_record_client_;
   scoped_ptr<PermissionBrokerClient> permission_broker_client_;
   scoped_ptr<SystemClockClient> system_clock_client_;
   scoped_ptr<PowerManagerClient> power_manager_client_;
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SMSClient> sms_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
-  scoped_ptr<IBusClient> ibus_client_;
 
   scoped_ptr<PowerPolicyController> power_policy_controller_;
 };
 
 // static
 void DBusThreadManager::Initialize() {
   // Ignore Initialize() if we set a test DBusThreadManager.
   if (g_dbus_thread_manager_set_for_testing)
     return;
   // If we initialize DBusThreadManager twice we may also be shutting it down
@@ skipping 124 matching lines @@
     g_dbus_thread_manager->GetSystemBus()->GetManagedObjects();
 }
 
 // static
 void DBusThreadManager::InitClient(DBusClient* client) {
   if (client)
     client->Init(g_dbus_thread_manager->GetSystemBus());
 }
 
 }  // namespace chromeos