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

Side by Side Diff: device/bluetooth/bluetooth_discovery_filter.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_DISCOVERY_FILTER_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_DISCOVERY_FILTER_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_DISCOVERY_FILTER_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_DISCOVERY_FILTER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 // Returns result of merging two filters together. If at least one of the 55 // Returns result of merging two filters together. If at least one of the
56 // filters is NULL this will return an empty filter 56 // filters is NULL this will return an empty filter
57 static std::unique_ptr<device::BluetoothDiscoveryFilter> Merge( 57 static std::unique_ptr<device::BluetoothDiscoveryFilter> Merge(
58 const device::BluetoothDiscoveryFilter* filter_a, 58 const device::BluetoothDiscoveryFilter* filter_a,
59 const device::BluetoothDiscoveryFilter* filter_b); 59 const device::BluetoothDiscoveryFilter* filter_b);
60 60
61 private: 61 private:
62 std::unique_ptr<int16_t> rssi_; 62 std::unique_ptr<int16_t> rssi_;
63 std::unique_ptr<uint16_t> pathloss_; 63 std::unique_ptr<uint16_t> pathloss_;
64 BluetoothTransport transport_; 64 BluetoothTransport transport_;
65 ScopedVector<device::BluetoothUUID> uuids_; 65 std::vector<device::BluetoothUUID> uuids_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(BluetoothDiscoveryFilter); 67 DISALLOW_COPY_AND_ASSIGN(BluetoothDiscoveryFilter);
68 }; 68 };
69 69
70 } // namespace device 70 } // namespace device
71 71
72 #endif // DEVICE_BLUETOOTH_BLUETOOTH_DISCOVERY_FILTER_H_ 72 #endif // DEVICE_BLUETOOTH_BLUETOOTH_DISCOVERY_FILTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698