| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <utility> | 5 #include <utility> |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "device/bluetooth/device.h" | 8 #include "device/bluetooth/device.h" |
| 9 #include "mojo/public/cpp/bindings/strong_binding.h" | 9 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 10 | 10 |
| 11 namespace bluetooth { | 11 namespace bluetooth { |
| 12 | 12 |
| 13 Device::Device(const std::string& address, | 13 Device::Device(const std::string& address, |
| 14 scoped_refptr<device::BluetoothAdapter> adapter) | 14 scoped_refptr<device::BluetoothAdapter> adapter) |
| 15 : address_(address), adapter_(std::move(adapter)) {} | 15 : address_(address), adapter_(std::move(adapter)) {} |
| 16 | 16 |
| 17 Device::~Device() {} | 17 Device::~Device() {} |
| 18 | 18 |
| 19 // static | 19 // static |
| 20 mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct( | 20 mojom::DeviceInfoPtr Device::ConstructDeviceInfoStruct( |
| 21 const device::BluetoothDevice* device) { | 21 const device::BluetoothDevice* device) { |
| 22 mojom::DeviceInfoPtr device_info = mojom::DeviceInfo::New(); | 22 mojom::DeviceInfoPtr device_info = mojom::DeviceInfo::New(); |
| 23 | 23 |
| 24 device_info->name = device->GetName(); | 24 device_info->name = device->GetName(); |
| 25 device_info->name_for_display = | 25 device_info->name_for_display = |
| 26 base::UTF16ToUTF8(device->GetNameForDisplay()); | 26 base::UTF16ToUTF8(device->GetNameForDisplay()); |
| 27 device_info->address = device->GetAddress(); | 27 device_info->address = device->GetAddress(); |
| 28 device_info->rssi = device->GetInquiryRSSI().value_or(0); |
| 28 | 29 |
| 29 return device_info; | 30 return device_info; |
| 30 } | 31 } |
| 31 | 32 |
| 32 void Device::GetInfo(const GetInfoCallback& callback) { | 33 void Device::GetInfo(const GetInfoCallback& callback) { |
| 33 device::BluetoothDevice* device = adapter_->GetDevice(address_); | 34 device::BluetoothDevice* device = adapter_->GetDevice(address_); |
| 34 if (device) { | 35 if (device) { |
| 35 mojom::DeviceInfoPtr device_info = ConstructDeviceInfoStruct(device); | 36 mojom::DeviceInfoPtr device_info = ConstructDeviceInfoStruct(device); |
| 36 callback.Run(std::move(device_info)); | 37 callback.Run(std::move(device_info)); |
| 37 } else { | 38 } else { |
| 38 callback.Run(nullptr); | 39 callback.Run(nullptr); |
| 39 } | 40 } |
| 40 } | 41 } |
| 41 | 42 |
| 42 } // namespace bluetooth | 43 } // namespace bluetooth |
| OLD | NEW |