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

Side by Side Diff: device/bluetooth/bluetooth_remote_gatt_service_android.h

Issue 2606823002: Remove base::ScopedPtrHashMap from device/. (Closed)
Patch Set: one last fix Created 3 years, 11 months 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 unified diff | Download patch
OLDNEW
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>
11 #include <unordered_map>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/android/jni_android.h" 14 #include "base/android/jni_android.h"
14 #include "base/android/scoped_java_ref.h" 15 #include "base/android/scoped_java_ref.h"
15 #include "base/containers/scoped_ptr_hash_map.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "device/bluetooth/bluetooth_remote_gatt_service.h" 17 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
18 #include "device/bluetooth/bluetooth_uuid.h" 18 #include "device/bluetooth/bluetooth_uuid.h"
19 19
20 namespace device { 20 namespace device {
21 21
22 class BluetoothAdapterAndroid; 22 class BluetoothAdapterAndroid;
23 class BluetoothDeviceAndroid; 23 class BluetoothDeviceAndroid;
24 class BluetoothRemoteGattCharacteristicAndroid; 24 class BluetoothRemoteGattCharacteristicAndroid;
25 25
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698