Index: chromeos/dbus/bluetooth_device_client.cc |
diff --git a/chromeos/dbus/bluetooth_device_client.cc b/chromeos/dbus/bluetooth_device_client.cc |
deleted file mode 100644 |
index 02a5c6b7baced51ceb8e9bde6f4b822c86471782..0000000000000000000000000000000000000000 |
--- a/chromeos/dbus/bluetooth_device_client.cc |
+++ /dev/null |
@@ -1,400 +0,0 @@ |
-// Copyright 2013 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/bluetooth_device_client.h" |
- |
-#include "base/bind.h" |
-#include "base/logging.h" |
-#include "base/stl_util.h" |
-#include "dbus/bus.h" |
-#include "dbus/message.h" |
-#include "dbus/object_manager.h" |
-#include "dbus/object_proxy.h" |
-#include "third_party/cros_system_api/dbus/service_constants.h" |
- |
-namespace chromeos { |
- |
-namespace { |
- |
-// Value returned for the the RSSI or TX power if it cannot be read. |
-const int kUnknownPower = 127; |
- |
-} // namespace |
- |
-const char BluetoothDeviceClient::kNoResponseError[] = |
- "org.chromium.Error.NoResponse"; |
-const char BluetoothDeviceClient::kUnknownDeviceError[] = |
- "org.chromium.Error.UnknownDevice"; |
- |
-BluetoothDeviceClient::Properties::Properties( |
- dbus::ObjectProxy* object_proxy, |
- const std::string& interface_name, |
- const PropertyChangedCallback& callback) |
- : dbus::PropertySet(object_proxy, interface_name, callback) { |
- RegisterProperty(bluetooth_device::kAddressProperty, &address); |
- RegisterProperty(bluetooth_device::kNameProperty, &name); |
- RegisterProperty(bluetooth_device::kIconProperty, &icon); |
- RegisterProperty(bluetooth_device::kClassProperty, &bluetooth_class); |
- RegisterProperty(bluetooth_device::kAppearanceProperty, &appearance); |
- RegisterProperty(bluetooth_device::kUUIDsProperty, &uuids); |
- RegisterProperty(bluetooth_device::kPairedProperty, &paired); |
- RegisterProperty(bluetooth_device::kConnectedProperty, &connected); |
- RegisterProperty(bluetooth_device::kTrustedProperty, &trusted); |
- RegisterProperty(bluetooth_device::kBlockedProperty, &blocked); |
- RegisterProperty(bluetooth_device::kAliasProperty, &alias); |
- RegisterProperty(bluetooth_device::kAdapterProperty, &adapter); |
- RegisterProperty(bluetooth_device::kLegacyPairingProperty, &legacy_pairing); |
- RegisterProperty(bluetooth_device::kModaliasProperty, &modalias); |
- RegisterProperty(bluetooth_device::kRSSIProperty, &rssi); |
- RegisterProperty(bluetooth_device::kTxPowerProperty, &tx_power); |
-} |
- |
-BluetoothDeviceClient::Properties::~Properties() { |
-} |
- |
- |
-// The BluetoothDeviceClient implementation used in production. |
-class BluetoothDeviceClientImpl |
- : public BluetoothDeviceClient, |
- public dbus::ObjectManager::Interface { |
- public: |
- BluetoothDeviceClientImpl() |
- : object_manager_(NULL), weak_ptr_factory_(this) {} |
- |
- ~BluetoothDeviceClientImpl() override { |
- object_manager_->UnregisterInterface( |
- bluetooth_device::kBluetoothDeviceInterface); |
- } |
- |
- // BluetoothDeviceClient override. |
- void AddObserver(BluetoothDeviceClient::Observer* observer) override { |
- DCHECK(observer); |
- observers_.AddObserver(observer); |
- } |
- |
- // BluetoothDeviceClient override. |
- void RemoveObserver(BluetoothDeviceClient::Observer* observer) override { |
- DCHECK(observer); |
- observers_.RemoveObserver(observer); |
- } |
- |
- // dbus::ObjectManager::Interface override. |
- dbus::PropertySet* CreateProperties( |
- dbus::ObjectProxy* object_proxy, |
- const dbus::ObjectPath& object_path, |
- const std::string& interface_name) override { |
- Properties* properties = new Properties( |
- object_proxy, |
- interface_name, |
- base::Bind(&BluetoothDeviceClientImpl::OnPropertyChanged, |
- weak_ptr_factory_.GetWeakPtr(), |
- object_path)); |
- return static_cast<dbus::PropertySet*>(properties); |
- } |
- |
- // BluetoothDeviceClient override. |
- std::vector<dbus::ObjectPath> GetDevicesForAdapter( |
- const dbus::ObjectPath& adapter_path) override { |
- std::vector<dbus::ObjectPath> object_paths, device_paths; |
- device_paths = object_manager_->GetObjectsWithInterface( |
- bluetooth_device::kBluetoothDeviceInterface); |
- for (std::vector<dbus::ObjectPath>::iterator iter = device_paths.begin(); |
- iter != device_paths.end(); ++iter) { |
- Properties* properties = GetProperties(*iter); |
- if (properties->adapter.value() == adapter_path) |
- object_paths.push_back(*iter); |
- } |
- return object_paths; |
- } |
- |
- // BluetoothDeviceClient override. |
- Properties* GetProperties(const dbus::ObjectPath& object_path) override { |
- return static_cast<Properties*>( |
- object_manager_->GetProperties( |
- object_path, |
- bluetooth_device::kBluetoothDeviceInterface)); |
- } |
- |
- // BluetoothDeviceClient override. |
- void Connect(const dbus::ObjectPath& object_path, |
- const base::Closure& callback, |
- const ErrorCallback& error_callback) override { |
- dbus::MethodCall method_call( |
- bluetooth_device::kBluetoothDeviceInterface, |
- bluetooth_device::kConnect); |
- |
- dbus::ObjectProxy* object_proxy = |
- object_manager_->GetObjectProxy(object_path); |
- if (!object_proxy) { |
- error_callback.Run(kUnknownDeviceError, ""); |
- return; |
- } |
- |
- // Connect may take an arbitrary length of time, so use no timeout. |
- object_proxy->CallMethodWithErrorCallback( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_INFINITE, |
- base::Bind(&BluetoothDeviceClientImpl::OnSuccess, |
- weak_ptr_factory_.GetWeakPtr(), callback), |
- base::Bind(&BluetoothDeviceClientImpl::OnError, |
- weak_ptr_factory_.GetWeakPtr(), error_callback)); |
- } |
- |
- // BluetoothDeviceClient override. |
- void Disconnect(const dbus::ObjectPath& object_path, |
- const base::Closure& callback, |
- const ErrorCallback& error_callback) override { |
- dbus::MethodCall method_call( |
- bluetooth_device::kBluetoothDeviceInterface, |
- bluetooth_device::kDisconnect); |
- |
- dbus::ObjectProxy* object_proxy = |
- object_manager_->GetObjectProxy(object_path); |
- if (!object_proxy) { |
- error_callback.Run(kUnknownDeviceError, ""); |
- return; |
- } |
- |
- object_proxy->CallMethodWithErrorCallback( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
- base::Bind(&BluetoothDeviceClientImpl::OnSuccess, |
- weak_ptr_factory_.GetWeakPtr(), callback), |
- base::Bind(&BluetoothDeviceClientImpl::OnError, |
- weak_ptr_factory_.GetWeakPtr(), error_callback)); |
- } |
- |
- // BluetoothDeviceClient override. |
- void ConnectProfile(const dbus::ObjectPath& object_path, |
- const std::string& uuid, |
- const base::Closure& callback, |
- const ErrorCallback& error_callback) override { |
- dbus::MethodCall method_call( |
- bluetooth_device::kBluetoothDeviceInterface, |
- bluetooth_device::kConnectProfile); |
- |
- dbus::MessageWriter writer(&method_call); |
- writer.AppendString(uuid); |
- |
- dbus::ObjectProxy* object_proxy = |
- object_manager_->GetObjectProxy(object_path); |
- if (!object_proxy) { |
- error_callback.Run(kUnknownDeviceError, ""); |
- return; |
- } |
- |
- // Connect may take an arbitrary length of time, so use no timeout. |
- object_proxy->CallMethodWithErrorCallback( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_INFINITE, |
- base::Bind(&BluetoothDeviceClientImpl::OnSuccess, |
- weak_ptr_factory_.GetWeakPtr(), callback), |
- base::Bind(&BluetoothDeviceClientImpl::OnError, |
- weak_ptr_factory_.GetWeakPtr(), error_callback)); |
- } |
- |
- // BluetoothDeviceClient override. |
- void DisconnectProfile(const dbus::ObjectPath& object_path, |
- const std::string& uuid, |
- const base::Closure& callback, |
- const ErrorCallback& error_callback) override { |
- dbus::MethodCall method_call( |
- bluetooth_device::kBluetoothDeviceInterface, |
- bluetooth_device::kDisconnectProfile); |
- |
- dbus::MessageWriter writer(&method_call); |
- writer.AppendString(uuid); |
- |
- dbus::ObjectProxy* object_proxy = |
- object_manager_->GetObjectProxy(object_path); |
- if (!object_proxy) { |
- error_callback.Run(kUnknownDeviceError, ""); |
- return; |
- } |
- |
- object_proxy->CallMethodWithErrorCallback( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
- base::Bind(&BluetoothDeviceClientImpl::OnSuccess, |
- weak_ptr_factory_.GetWeakPtr(), callback), |
- base::Bind(&BluetoothDeviceClientImpl::OnError, |
- weak_ptr_factory_.GetWeakPtr(), error_callback)); |
- } |
- |
- // BluetoothDeviceClient override. |
- void Pair(const dbus::ObjectPath& object_path, |
- const base::Closure& callback, |
- const ErrorCallback& error_callback) override { |
- dbus::MethodCall method_call( |
- bluetooth_device::kBluetoothDeviceInterface, |
- bluetooth_device::kPair); |
- |
- dbus::ObjectProxy* object_proxy = |
- object_manager_->GetObjectProxy(object_path); |
- if (!object_proxy) { |
- error_callback.Run(kUnknownDeviceError, ""); |
- return; |
- } |
- |
- // Pairing may take an arbitrary length of time, so use no timeout. |
- object_proxy->CallMethodWithErrorCallback( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_INFINITE, |
- base::Bind(&BluetoothDeviceClientImpl::OnSuccess, |
- weak_ptr_factory_.GetWeakPtr(), callback), |
- base::Bind(&BluetoothDeviceClientImpl::OnError, |
- weak_ptr_factory_.GetWeakPtr(), error_callback)); |
- } |
- |
- // BluetoothDeviceClient override. |
- void CancelPairing(const dbus::ObjectPath& object_path, |
- const base::Closure& callback, |
- const ErrorCallback& error_callback) override { |
- dbus::MethodCall method_call( |
- bluetooth_device::kBluetoothDeviceInterface, |
- bluetooth_device::kCancelPairing); |
- |
- dbus::ObjectProxy* object_proxy = |
- object_manager_->GetObjectProxy(object_path); |
- if (!object_proxy) { |
- error_callback.Run(kUnknownDeviceError, ""); |
- return; |
- } |
- object_proxy->CallMethodWithErrorCallback( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
- base::Bind(&BluetoothDeviceClientImpl::OnSuccess, |
- weak_ptr_factory_.GetWeakPtr(), callback), |
- base::Bind(&BluetoothDeviceClientImpl::OnError, |
- weak_ptr_factory_.GetWeakPtr(), error_callback)); |
- } |
- |
- // BluetoothDeviceClient override. |
- void GetConnInfo(const dbus::ObjectPath& object_path, |
- const ConnInfoCallback& callback, |
- const ErrorCallback& error_callback) override { |
- dbus::MethodCall method_call( |
- bluetooth_plugin_device::kBluetoothPluginInterface, |
- bluetooth_plugin_device::kGetConnInfo); |
- |
- dbus::ObjectProxy* object_proxy = |
- object_manager_->GetObjectProxy(object_path); |
- if (!object_proxy) { |
- error_callback.Run(kUnknownDeviceError, ""); |
- return; |
- } |
- object_proxy->CallMethodWithErrorCallback( |
- &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
- base::Bind(&BluetoothDeviceClientImpl::OnGetConnInfoSuccess, |
- weak_ptr_factory_.GetWeakPtr(), callback), |
- base::Bind(&BluetoothDeviceClientImpl::OnError, |
- weak_ptr_factory_.GetWeakPtr(), error_callback)); |
- } |
- |
- protected: |
- void Init(dbus::Bus* bus) override { |
- object_manager_ = bus->GetObjectManager( |
- bluetooth_object_manager::kBluetoothObjectManagerServiceName, |
- dbus::ObjectPath( |
- bluetooth_object_manager::kBluetoothObjectManagerServicePath)); |
- object_manager_->RegisterInterface( |
- bluetooth_device::kBluetoothDeviceInterface, this); |
- } |
- |
- private: |
- // Called by dbus::ObjectManager when an object with the device interface |
- // is created. Informs observers. |
- void ObjectAdded(const dbus::ObjectPath& object_path, |
- const std::string& interface_name) override { |
- FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_, |
- DeviceAdded(object_path)); |
- } |
- |
- // Called by dbus::ObjectManager when an object with the device interface |
- // is removed. Informs observers. |
- void ObjectRemoved(const dbus::ObjectPath& object_path, |
- const std::string& interface_name) override { |
- FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_, |
- DeviceRemoved(object_path)); |
- } |
- |
- // 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(BluetoothDeviceClient::Observer, observers_, |
- DevicePropertyChanged(object_path, property_name)); |
- } |
- |
- // Called when a response for successful method call is received. |
- void OnSuccess(const base::Closure& callback, |
- dbus::Response* response) { |
- DCHECK(response); |
- callback.Run(); |
- } |
- |
- // Called when a response for the GetConnInfo method is received. |
- void OnGetConnInfoSuccess(const ConnInfoCallback& callback, |
- dbus::Response* response) { |
- int16 rssi = kUnknownPower; |
- int16 transmit_power = kUnknownPower; |
- int16 max_transmit_power = kUnknownPower; |
- |
- if (!response) { |
- LOG(ERROR) << "GetConnInfo succeeded, but no response received."; |
- callback.Run(rssi, transmit_power, max_transmit_power); |
- return; |
- } |
- |
- dbus::MessageReader reader(response); |
- if (!reader.PopInt16(&rssi) || !reader.PopInt16(&transmit_power) || |
- !reader.PopInt16(&max_transmit_power)) { |
- LOG(ERROR) << "Arguments for GetConnInfo invalid."; |
- } |
- callback.Run(rssi, transmit_power, max_transmit_power); |
- } |
- |
- // Called when a response for a failed method call is received. |
- void OnError(const ErrorCallback& error_callback, |
- dbus::ErrorResponse* response) { |
- // Error response has optional error message argument. |
- std::string error_name; |
- std::string error_message; |
- if (response) { |
- dbus::MessageReader reader(response); |
- error_name = response->GetErrorName(); |
- reader.PopString(&error_message); |
- } else { |
- error_name = kNoResponseError; |
- error_message = ""; |
- } |
- error_callback.Run(error_name, error_message); |
- } |
- |
- dbus::ObjectManager* object_manager_; |
- |
- // List of observers interested in event notifications from us. |
- base::ObserverList<BluetoothDeviceClient::Observer> observers_; |
- |
- // Weak pointer factory for generating 'this' pointers that might live longer |
- // than we do. |
- // Note: This should remain the last member so it'll be destroyed and |
- // invalidate its weak pointers before any other members are destroyed. |
- base::WeakPtrFactory<BluetoothDeviceClientImpl> weak_ptr_factory_; |
- |
- DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceClientImpl); |
-}; |
- |
-BluetoothDeviceClient::BluetoothDeviceClient() { |
-} |
- |
-BluetoothDeviceClient::~BluetoothDeviceClient() { |
-} |
- |
-BluetoothDeviceClient* BluetoothDeviceClient::Create() { |
- return new BluetoothDeviceClientImpl(); |
-} |
- |
-} // namespace chromeos |