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

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

Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map (Closed)
Patch Set: Mac bustage Created 3 years, 12 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>
(...skipping 124 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