Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(840)

Unified Diff: device/bluetooth/device.cc

Issue 2448713002: bluetooth: Add Device connection logic and accompanying user interface. (Closed)
Patch Set: Remove binding variable in Device.Create Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/device.h ('k') | device/bluetooth/device_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/device.cc
diff --git a/device/bluetooth/device.cc b/device/bluetooth/device.cc
index 7e662802eabb5aed91c9859f782903049c866170..f6f268368baa4398314f4297ab83cffe93562707 100644
--- a/device/bluetooth/device.cc
+++ b/device/bluetooth/device.cc
@@ -3,18 +3,27 @@
// found in the LICENSE file.
#include <utility>
+#include <vector>
#include "base/strings/utf_string_conversions.h"
#include "device/bluetooth/device.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
namespace bluetooth {
+Device::~Device() {
+ adapter_->RemoveObserver(this);
+}
-Device::Device(const std::string& address,
- scoped_refptr<device::BluetoothAdapter> adapter)
- : address_(address), adapter_(std::move(adapter)) {}
-
-Device::~Device() {}
+// static
+void Device::Create(scoped_refptr<device::BluetoothAdapter> adapter,
+ std::unique_ptr<device::BluetoothGattConnection> connection,
+ mojom::DeviceRequest request) {
+ auto device_impl =
+ base::WrapUnique(new Device(adapter, std::move(connection)));
+ auto* device_ptr = device_impl.get();
+ device_ptr->binding_ =
+ mojo::MakeStrongBinding(std::move(device_impl), std::move(request));
+}
// static
mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct(
@@ -25,6 +34,7 @@ mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct(
device_info->name_for_display =
base::UTF16ToUTF8(device->GetNameForDisplay());
device_info->address = device->GetAddress();
+ device_info->is_gatt_connected = device->IsGattConnected();
if (device->GetInquiryRSSI()) {
device_info->rssi = mojom::RSSIWrapper::New();
@@ -34,14 +44,88 @@ mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct(
return device_info;
}
+void Device::DeviceChanged(device::BluetoothAdapter* adapter,
+ device::BluetoothDevice* device) {
+ if (device->GetAddress() != GetAddress()) {
+ return;
+ }
+
+ if (!device->IsGattConnected()) {
+ binding_->Close();
+ }
+}
+
+void Device::GattServicesDiscovered(device::BluetoothAdapter* adapter,
+ device::BluetoothDevice* device) {
+ if (device->GetAddress() != GetAddress()) {
+ return;
+ }
+
+ std::vector<base::Closure> requests;
+ requests.swap(pending_services_requests_);
+ for (const base::Closure& request : requests) {
+ request.Run();
+ }
+}
+
+void Device::Disconnect() {
+ binding_->Close();
+}
+
void Device::GetInfo(const GetInfoCallback& callback) {
- device::BluetoothDevice* device = adapter_->GetDevice(address_);
- if (device) {
- mojom::DeviceInfoPtr device_info = ConstructDeviceInfoStruct(device);
- callback.Run(std::move(device_info));
- } else {
- callback.Run(nullptr);
+ device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
+ DCHECK(device);
+
+ callback.Run(ConstructDeviceInfoStruct(device));
+}
+
+void Device::GetServices(const GetServicesCallback& callback) {
+ device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
+ DCHECK(device);
+
+ if (device->IsGattServicesDiscoveryComplete()) {
+ GetServicesImpl(callback);
+ return;
}
+
+ // pending_services_requests_ is owned by Device, so base::Unretained is
+ // safe.
+ pending_services_requests_.push_back(
+ base::Bind(&Device::GetServicesImpl, base::Unretained(this), callback));
+}
+
+Device::Device(scoped_refptr<device::BluetoothAdapter> adapter,
+ std::unique_ptr<device::BluetoothGattConnection> connection)
+ : adapter_(std::move(adapter)), connection_(std::move(connection)) {
+ adapter_->AddObserver(this);
+}
+
+void Device::GetServicesImpl(const GetServicesCallback& callback) {
+ device::BluetoothDevice* device = adapter_->GetDevice(GetAddress());
+ DCHECK(device);
+
+ std::vector<mojom::ServiceInfoPtr> services;
+
+ for (const device::BluetoothRemoteGattService* service :
+ device->GetGattServices()) {
+ services.push_back(ConstructServiceInfoStruct(*service));
+ }
+
+ callback.Run(std::move(services));
+}
+
+mojom::ServiceInfoPtr Device::ConstructServiceInfoStruct(
+ const device::BluetoothRemoteGattService& service) {
+ mojom::ServiceInfoPtr service_info = mojom::ServiceInfo::New();
+
+ service_info->uuid = service.GetUUID();
+ service_info->is_primary = service.IsPrimary();
+
+ return service_info;
+}
+
+const std::string& Device::GetAddress() {
+ return connection_->GetDeviceAddress();
}
} // namespace bluetooth
« no previous file with comments | « device/bluetooth/device.h ('k') | device/bluetooth/device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698