ChromeOS: Remove unused IBus classes from chromeos/.

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_implementation_type.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
-#include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
-#include "chromeos/dbus/ibus/ibus_engine_service.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_tag_client.h"
 #include "chromeos/dbus/permission_broker_client.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/dbus/power_policy_controller.h"
@@ skipping 90 matching lines @@
     system_bus_->GetManagedObjects();
   }
 
   virtual ~DBusThreadManagerImpl() {
     FOR_EACH_OBSERVER(DBusThreadManagerObserver, observers_,
                       OnDBusThreadManagerDestroying(this));
 
     // Shut down the bus. During the browser shutdown, it's ok to shut down
     // the bus synchronously.
     system_bus_->ShutdownOnDBusThreadAndBlock();
-    if (ibus_bus_.get())
-      ibus_bus_->ShutdownOnDBusThreadAndBlock();
-
-    // Release IBusEngineService instances.
-    for (std::map<dbus::ObjectPath, IBusEngineService*>::iterator it
-            = ibus_engine_services_.begin();
-         it != ibus_engine_services_.end(); it++) {
-      delete it->second;
-    }
 
     // Stop the D-Bus thread.
     dbus_thread_->Stop();
   }
 
   // DBusThreadManager override.
   virtual void AddObserver(DBusThreadManagerObserver* observer) OVERRIDE {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
   // DBusThreadManager override.
   virtual void RemoveObserver(DBusThreadManagerObserver* observer) OVERRIDE {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
 
   // DBusThreadManager override.
   virtual void InitIBusBus(
       const std::string &ibus_address,
       const base::Closure& on_disconnected_callback) OVERRIDE {
-    DCHECK(!ibus_bus_.get());
-    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_task_runner = dbus_thread_->message_loop_proxy();
-    ibus_bus_options.disconnected_callback = on_disconnected_callback;
-    ibus_bus_ = new dbus::Bus(ibus_bus_options);
-    ibus_address_ = ibus_address;
-    VLOG(1) << "Connected to ibus-daemon: " << ibus_address;
-
-    DBusClientImplementationType client_type = STUB_DBUS_CLIENT_IMPLEMENTATION;
-
-    ibus_client_.reset(
-        IBusClient::Create(client_type, ibus_bus_.get()));
-    ibus_engine_factory_service_.reset(
-        IBusEngineFactoryService::Create(ibus_bus_.get(), client_type));
-
-    ibus_engine_services_.clear();
+    ibus_client_.reset(IBusClient::Create());
   }
 
   // DBusThreadManager overrides:
   virtual dbus::Bus* GetSystemBus() OVERRIDE {
     return system_bus_.get();
   }
 
-  virtual dbus::Bus* GetIBusBus() OVERRIDE {
-    return ibus_bus_.get();
-  }
-
   virtual BluetoothAdapterClient* GetBluetoothAdapterClient() OVERRIDE {
     return bluetooth_adapter_client_.get();
   }
 
   virtual BluetoothAgentManagerClient* GetBluetoothAgentManagerClient()
       OVERRIDE {
     return bluetooth_agent_manager_client_.get();
   }
 
   virtual BluetoothDeviceClient* GetBluetoothDeviceClient() OVERRIDE {
@@ skipping 102 matching lines @@
   }
 
   virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE {
     return update_engine_client_.get();
   }
 
   virtual IBusClient* GetIBusClient() OVERRIDE {
     return ibus_client_.get();
   }
 
-  virtual IBusEngineFactoryService* GetIBusEngineFactoryService() OVERRIDE {
-    return ibus_engine_factory_service_.get();
-  }
-
-  virtual IBusEngineService* GetIBusEngineService(
-      const dbus::ObjectPath& object_path) OVERRIDE {
-    if (ibus_engine_services_.find(object_path)
-            == ibus_engine_services_.end()) {
-      ibus_engine_services_[object_path] = IBusEngineService::Create();
-    }
-    return ibus_engine_services_[object_path];
-  }
-
-  virtual void RemoveIBusEngineService(
-      const dbus::ObjectPath& object_path) OVERRIDE {
-    if (ibus_engine_services_.find(object_path) !=
-        ibus_engine_services_.end()) {
-      LOG(WARNING) << "Object path not found: " << object_path.value();
-      return;
-    }
-    delete ibus_engine_services_[object_path];
-    ibus_engine_services_.erase(object_path);
-  }
-
  private:
   // Initializes |client| with the |system_bus_|.
   void InitClient(DBusClient* client) {
     client->Init(system_bus_.get());
   }
 
   // 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,
@@ skipping 41 matching lines @@
     system_clock_client_.reset(SystemClockClient::Create(client_type));
     update_engine_client_.reset(UpdateEngineClient::Create(client_type));
   }
 
   // Note: Keep this before other members so they can call AddObserver() in
   // their c'tors.
   ObserverList<DBusThreadManagerObserver> observers_;
 
   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<BluetoothAgentManagerClient> bluetooth_agent_manager_client_;
   scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
   scoped_ptr<BluetoothInputClient> bluetooth_input_client_;
   scoped_ptr<BluetoothProfileManagerClient> bluetooth_profile_manager_client_;
   scoped_ptr<CrasAudioClient> cras_audio_client_;
   scoped_ptr<CrosDisksClient> cros_disks_client_;
   scoped_ptr<CryptohomeClient> cryptohome_client_;
   scoped_ptr<DebugDaemonClient> debug_daemon_client_;
   scoped_ptr<ShillDeviceClient> shill_device_client_;
@@ skipping 11 matching lines @@
   scoped_ptr<NfcAdapterClient> nfc_adapter_client_;
   scoped_ptr<NfcDeviceClient> nfc_device_client_;
   scoped_ptr<NfcTagClient> nfc_tag_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<IBusEngineFactoryService> ibus_engine_factory_service_;
-  std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_;
   scoped_ptr<PowerPolicyController> power_policy_controller_;
 
-  std::string ibus_address_;
 };
 
 // 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
   // early; do not allow that.
   CHECK(g_dbus_thread_manager == NULL);
@@ skipping 72 matching lines @@
 }
 
 // static
 DBusThreadManager* DBusThreadManager::Get() {
   CHECK(g_dbus_thread_manager)
       << "DBusThreadManager::Get() called before Initialize()";
   return g_dbus_thread_manager;
 }
 
 }  // namespace chromeos