Index: device/bluetooth/adapter.h |
diff --git a/device/bluetooth/adapter.h b/device/bluetooth/adapter.h |
index ea034afb22c380f75a33fb6399c7b5dc98088085..bc9592e9456fad02f7c3aff172616f6f3d2b13cf 100644 |
--- a/device/bluetooth/adapter.h |
+++ b/device/bluetooth/adapter.h |
@@ -5,10 +5,14 @@ |
#ifndef DEVICE_BLUETOOTH_ADAPTER_H_ |
#define DEVICE_BLUETOOTH_ADAPTER_H_ |
+#include <string> |
+ |
#include "base/macros.h" |
+#include "base/memory/ref_counted.h" |
#include "device/bluetooth/bluetooth_adapter.h" |
#include "device/bluetooth/bluetooth_adapter_factory.h" |
#include "device/bluetooth/public/interfaces/adapter.mojom.h" |
+#include "device/bluetooth/public/interfaces/device.mojom.h" |
namespace bluetooth { |
@@ -24,6 +28,8 @@ class Adapter : public mojom::Adapter, |
// mojom::Adapter overrides: |
void GetInfo(const GetInfoCallback& callback) override; |
+ void GetDevice(const std::string& address, |
ortuno
2016/10/11 00:45:45
nit: Match the order of the mojom declarations.
mbrunson
2016/10/11 19:30:34
Done.
|
+ const GetDeviceCallback& callback) override; |
void GetDevices(const GetDevicesCallback& callback) override; |
void SetClient(mojom::AdapterClientPtr client) override; |
@@ -34,10 +40,6 @@ class Adapter : public mojom::Adapter, |
device::BluetoothDevice* device) override; |
private: |
- // Creates a mojom::DeviceInfo using info from the given |device|. |
- static mojom::DeviceInfoPtr ConstructDeviceInfoStruct( |
- const device::BluetoothDevice* device); |
- |
// The current Bluetooth adapter. |
scoped_refptr<device::BluetoothAdapter> adapter_; |