| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_ANDROID_H_ | 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_ANDROID_H_ |
| 6 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_ANDROID_H_ | 6 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_ANDROID_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 BluetoothAdapterAndroid* adapter_; | 102 BluetoothAdapterAndroid* adapter_; |
| 103 | 103 |
| 104 // The device this GATT service belongs to. It's ok to store a raw pointer | 104 // The device this GATT service belongs to. It's ok to store a raw pointer |
| 105 // here since |device_| owns this instance. | 105 // here since |device_| owns this instance. |
| 106 BluetoothDeviceAndroid* device_; | 106 BluetoothDeviceAndroid* device_; |
| 107 | 107 |
| 108 // Adapter unique instance ID. | 108 // Adapter unique instance ID. |
| 109 std::string instance_id_; | 109 std::string instance_id_; |
| 110 | 110 |
| 111 // Map of characteristics, keyed by characteristic identifier. | 111 // Map of characteristics, keyed by characteristic identifier. |
| 112 base::ScopedPtrHashMap< | 112 std::unordered_map<std::string, |
| 113 std::string, | 113 std::unique_ptr<BluetoothRemoteGattCharacteristicAndroid>> |
| 114 std::unique_ptr<BluetoothRemoteGattCharacteristicAndroid>> | |
| 115 characteristics_; | 114 characteristics_; |
| 116 | 115 |
| 117 DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattServiceAndroid); | 116 DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattServiceAndroid); |
| 118 }; | 117 }; |
| 119 | 118 |
| 120 } // namespace device | 119 } // namespace device |
| 121 | 120 |
| 122 #endif // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_ANDROID_H_ | 121 #endif // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_SERVICE_ANDROID_H_ |
| OLD | NEW |