Index: chrome/browser/chromeos/dbus/bluetooth_input_client.cc |
diff --git a/chrome/browser/chromeos/dbus/bluetooth_input_client.cc b/chrome/browser/chromeos/dbus/bluetooth_input_client.cc |
deleted file mode 100644 |
index 88b5a8df07206a5b899a354001918809ffc8271d..0000000000000000000000000000000000000000 |
--- a/chrome/browser/chromeos/dbus/bluetooth_input_client.cc |
+++ /dev/null |
@@ -1,264 +0,0 @@ |
-// 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/dbus/bluetooth_input_client.h" |
- |
-#include <map> |
- |
-#include "base/bind.h" |
-#include "base/logging.h" |
-#include "base/stl_util.h" |
-#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h" |
-#include "chrome/browser/chromeos/dbus/bluetooth_property.h" |
-#include "dbus/bus.h" |
-#include "dbus/message.h" |
-#include "dbus/object_path.h" |
-#include "dbus/object_proxy.h" |
-#include "third_party/cros_system_api/dbus/service_constants.h" |
- |
-namespace chromeos { |
- |
-BluetoothInputClient::Properties::Properties(dbus::ObjectProxy* object_proxy, |
- PropertyChangedCallback callback) |
- : BluetoothPropertySet(object_proxy, |
- bluetooth_input::kBluetoothInputInterface, |
- callback) { |
- RegisterProperty(bluetooth_input::kConnectedProperty, &connected); |
-} |
- |
-BluetoothInputClient::Properties::~Properties() { |
-} |
- |
- |
-// The BluetoothInputClient implementation used in production. |
-class BluetoothInputClientImpl: public BluetoothInputClient, |
- private BluetoothAdapterClient::Observer { |
- public: |
- BluetoothInputClientImpl(dbus::Bus* bus, |
- BluetoothAdapterClient* adapter_client) |
- : weak_ptr_factory_(this), |
- bus_(bus) { |
- DVLOG(1) << "Creating BluetoothInputClientImpl"; |
- |
- DCHECK(adapter_client); |
- adapter_client->AddObserver(this); |
- } |
- |
- virtual ~BluetoothInputClientImpl() { |
- // Clean up Properties structures |
- for (ObjectMap::iterator iter = object_map_.begin(); |
- iter != object_map_.end(); ++iter) { |
- Object object = iter->second; |
- Properties* properties = object.second; |
- delete properties; |
- } |
- } |
- |
- // BluetoothInputClient override. |
- virtual void AddObserver(BluetoothInputClient::Observer* observer) |
- OVERRIDE { |
- DCHECK(observer); |
- observers_.AddObserver(observer); |
- } |
- |
- // BluetoothInputClient override. |
- virtual void RemoveObserver(BluetoothInputClient::Observer* observer) |
- OVERRIDE { |
- DCHECK(observer); |
- observers_.RemoveObserver(observer); |
- } |
- |
- // BluetoothInputClient override. |
- virtual Properties* GetProperties(const dbus::ObjectPath& object_path) |
- OVERRIDE { |
- return GetObject(object_path).second; |
- } |
- |
- // BluetoothInputClient override. |
- virtual void Connect(const dbus::ObjectPath& object_path, |
- const InputCallback& callback) OVERRIDE { |
- dbus::MethodCall method_call( |
- bluetooth_input::kBluetoothInputInterface, |
- bluetooth_input::kConnect); |
- |
- dbus::ObjectProxy* object_proxy = GetObjectProxy(object_path); |
- |
- object_proxy->CallMethod( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
- base::Bind(&BluetoothInputClientImpl::OnConnect, |
- weak_ptr_factory_.GetWeakPtr(), object_path, callback)); |
- } |
- |
- // BluetoothInputClient override. |
- virtual void Disconnect(const dbus::ObjectPath& object_path, |
- const InputCallback& callback) OVERRIDE { |
- dbus::MethodCall method_call( |
- bluetooth_input::kBluetoothInputInterface, |
- bluetooth_input::kDisconnect); |
- |
- dbus::ObjectProxy* object_proxy = GetObjectProxy(object_path); |
- |
- object_proxy->CallMethod( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
- base::Bind(&BluetoothInputClientImpl::OnDisconnect, |
- weak_ptr_factory_.GetWeakPtr(), object_path, callback)); |
- } |
- |
- private: |
- // We maintain a collection of dbus object proxies and properties structures |
- // for each input device. |
- typedef std::pair<dbus::ObjectProxy*, Properties*> Object; |
- typedef std::map<const dbus::ObjectPath, Object> ObjectMap; |
- ObjectMap object_map_; |
- |
- // BluetoothAdapterClient::Observer override. |
- virtual void DeviceCreated(const dbus::ObjectPath& adapter_path, |
- const dbus::ObjectPath& object_path) OVERRIDE { |
- } |
- |
- // BluetoothAdapterClient::Observer override. |
- virtual void DeviceRemoved(const dbus::ObjectPath& adapter_path, |
- const dbus::ObjectPath& object_path) OVERRIDE { |
- RemoveObject(object_path); |
- } |
- |
- // Ensures that we have an object proxy and properties structure for |
- // an input device with object path |object_path|, creating it if not and |
- // storing it in our |object_map_| map. |
- Object GetObject(const dbus::ObjectPath& object_path) { |
- ObjectMap::iterator iter = object_map_.find(object_path); |
- if (iter != object_map_.end()) |
- return iter->second; |
- |
- // Create the object proxy. |
- DCHECK(bus_); |
- dbus::ObjectProxy* object_proxy = bus_->GetObjectProxy( |
- bluetooth_input::kBluetoothInputServiceName, object_path); |
- |
- // Create the properties structure. |
- Properties* properties = new Properties( |
- object_proxy, |
- base::Bind(&BluetoothInputClientImpl::OnPropertyChanged, |
- weak_ptr_factory_.GetWeakPtr(), object_path)); |
- |
- properties->ConnectSignals(); |
- properties->GetAll(); |
- |
- Object object = std::make_pair(object_proxy, properties); |
- object_map_[object_path] = object; |
- return object; |
- } |
- |
- // Removes the dbus object proxy and properties for the input device with |
- // dbus object path |object_path| from our |object_map_| map. |
- void RemoveObject(const dbus::ObjectPath& object_path) { |
- ObjectMap::iterator iter = object_map_.find(object_path); |
- if (iter != object_map_.end()) { |
- // Clean up the Properties structure. |
- Object object = iter->second; |
- Properties* properties = object.second; |
- delete properties; |
- |
- object_map_.erase(iter); |
- } |
- } |
- |
- // Returns a pointer to the object proxy for |object_path|, creating |
- // it if necessary. |
- dbus::ObjectProxy* GetObjectProxy(const dbus::ObjectPath& object_path) { |
- return GetObject(object_path).first; |
- } |
- |
- // Called by BluetoothPropertySet when a property value is changed, |
- // either by result of a signal or response to a GetAll() or Get() |
- // call. Informs observers. |
- void OnPropertyChanged(const dbus::ObjectPath& object_path, |
- const std::string& property_name) { |
- FOR_EACH_OBSERVER(BluetoothInputClient::Observer, observers_, |
- InputPropertyChanged(object_path, property_name)); |
- } |
- |
- // Called when a response for Connect() is received. |
- void OnConnect(const dbus::ObjectPath& object_path, |
- const InputCallback& callback, |
- dbus::Response* response) { |
- LOG_IF(WARNING, !response) << object_path.value() |
- << ": OnConnect: failed."; |
- callback.Run(object_path, response); |
- } |
- |
- // Called when a response for Disconnect() is received. |
- void OnDisconnect(const dbus::ObjectPath& object_path, |
- const InputCallback& callback, |
- dbus::Response* response) { |
- LOG_IF(WARNING, !response) << object_path.value() |
- << ": OnDisconnect: failed."; |
- callback.Run(object_path, response); |
- } |
- |
- // Weak pointer factory for generating 'this' pointers that might live longer |
- // than we do. |
- base::WeakPtrFactory<BluetoothInputClientImpl> weak_ptr_factory_; |
- |
- dbus::Bus* bus_; |
- |
- // List of observers interested in event notifications from us. |
- ObserverList<BluetoothInputClient::Observer> observers_; |
- |
- DISALLOW_COPY_AND_ASSIGN(BluetoothInputClientImpl); |
-}; |
- |
-// The BluetoothInputClient implementation used on Linux desktop, which does |
-// nothing. |
-class BluetoothInputClientStubImpl : public BluetoothInputClient { |
- public: |
- // BluetoothInputClient override. |
- virtual void AddObserver(Observer* observer) OVERRIDE { |
- } |
- |
- // BluetoothInputClient override. |
- virtual void RemoveObserver(Observer* observer) OVERRIDE { |
- } |
- |
- // BluetoothInputClient override. |
- virtual Properties* GetProperties(const dbus::ObjectPath& object_path) |
- OVERRIDE { |
- VLOG(1) << "GetProperties: " << object_path.value(); |
- return NULL; |
- } |
- |
- // BluetoothInputClient override. |
- virtual void Connect(const dbus::ObjectPath& object_path, |
- const InputCallback& callback) OVERRIDE { |
- VLOG(1) << "Connect: " << object_path.value(); |
- callback.Run(object_path, false); |
- } |
- |
- // BluetoothInputClient override. |
- virtual void Disconnect(const dbus::ObjectPath& object_path, |
- const InputCallback& callback) OVERRIDE { |
- VLOG(1) << "Disconnect: " << object_path.value(); |
- callback.Run(object_path, false); |
- } |
-}; |
- |
-BluetoothInputClient::BluetoothInputClient() { |
-} |
- |
-BluetoothInputClient::~BluetoothInputClient() { |
-} |
- |
-BluetoothInputClient* BluetoothInputClient::Create( |
- DBusClientImplementationType type, |
- dbus::Bus* bus, |
- BluetoothAdapterClient* adapter_client) { |
- if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) |
- return new BluetoothInputClientImpl(bus, adapter_client); |
- DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); |
- return new BluetoothInputClientStubImpl(); |
-} |
- |
-} // namespace chromeos |