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

Side by Side Diff: device/bluetooth/bluetooth_remote_gatt_characteristic_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_CHARACTERISTIC_ANDROID_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
11 #include <unordered_map>
11 12
12 #include "base/android/jni_android.h" 13 #include "base/android/jni_android.h"
13 #include "base/android/scoped_java_ref.h" 14 #include "base/android/scoped_java_ref.h"
14 #include "base/containers/scoped_ptr_hash_map.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h" 16 #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
17 #include "device/bluetooth/bluetooth_remote_gatt_service.h" 17 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
18 18
19 namespace device { 19 namespace device {
20 20
21 class BluetoothAdapterAndroid; 21 class BluetoothAdapterAndroid;
22 class BluetoothRemoteGattDescriptorAndroid; 22 class BluetoothRemoteGattDescriptorAndroid;
23 class BluetoothRemoteGattServiceAndroid; 23 class BluetoothRemoteGattServiceAndroid;
24 24
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 ErrorCallback read_error_callback_; 135 ErrorCallback read_error_callback_;
136 136
137 // WriteRemoteCharacteristic callbacks and pending state. 137 // WriteRemoteCharacteristic callbacks and pending state.
138 bool write_pending_ = false; 138 bool write_pending_ = false;
139 base::Closure write_callback_; 139 base::Closure write_callback_;
140 ErrorCallback write_error_callback_; 140 ErrorCallback write_error_callback_;
141 141
142 std::vector<uint8_t> value_; 142 std::vector<uint8_t> value_;
143 143
144 // Map of descriptors, keyed by descriptor identifier. 144 // Map of descriptors, keyed by descriptor identifier.
145 base::ScopedPtrHashMap<std::string, 145 std::unordered_map<std::string,
146 std::unique_ptr<BluetoothRemoteGattDescriptorAndroid>> 146 std::unique_ptr<BluetoothRemoteGattDescriptorAndroid>>
147 descriptors_; 147 descriptors_;
148 148
149 DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicAndroid); 149 DISALLOW_COPY_AND_ASSIGN(BluetoothRemoteGattCharacteristicAndroid);
150 }; 150 };
151 151
152 } // namespace device 152 } // namespace device
153 153
154 #endif // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_ 154 #endif // DEVICE_BLUETOOTH_BLUETOOTH_REMOTE_GATT_CHARACTERISTIC_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698