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

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

Issue 1272503002: Fixed 2 bugs so that RequestDevice() works for non-paired devices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test3
Patch Set: scheib fix Created 5 years, 4 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_LOW_ENERGY_DEVICE_MAC_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_
7 7
8 #if defined(OS_IOS) 8 #if defined(OS_IOS)
9 #import <CoreBluetooth/CoreBluetooth.h> 9 #import <CoreBluetooth/CoreBluetooth.h>
10 #else // !defined(OS_IOS) 10 #else // !defined(OS_IOS)
11 #import <IOBluetooth/IOBluetooth.h> 11 #import <IOBluetooth/IOBluetooth.h>
12 #endif // defined(OS_IOS) 12 #endif // defined(OS_IOS)
13 13
14 #include <set>
15
14 #include "base/mac/scoped_nsobject.h" 16 #include "base/mac/scoped_nsobject.h"
15 #include "base/mac/sdk_forward_declarations.h" 17 #include "base/mac/sdk_forward_declarations.h"
16 #include "crypto/sha2.h" 18 #include "crypto/sha2.h"
17 #include "device/bluetooth/bluetooth_device_mac.h" 19 #include "device/bluetooth/bluetooth_device_mac.h"
18 20
19 namespace device { 21 namespace device {
20 22
21 class BluetoothLowEnergyDiscoverManagerMac; 23 class BluetoothLowEnergyDiscoverManagerMac;
22 24
23 class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac 25 class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 std::string identifier_; 114 std::string identifier_;
113 115
114 // A local address for the device created by hashing the peripheral 116 // A local address for the device created by hashing the peripheral
115 // identifier. 117 // identifier.
116 std::string hash_address_; 118 std::string hash_address_;
117 119
118 // Stores the time of the most recent call to Update(). 120 // Stores the time of the most recent call to Update().
119 base::scoped_nsobject<NSDate> last_update_time_; 121 base::scoped_nsobject<NSDate> last_update_time_;
120 122
121 // The services (identified by UUIDs) that this device provides. 123 // The services (identified by UUIDs) that this device provides.
122 UUIDList advertised_uuids_; 124 std::set<BluetoothUUID> advertised_uuids_;
123 125
124 DISALLOW_COPY_AND_ASSIGN(BluetoothLowEnergyDeviceMac); 126 DISALLOW_COPY_AND_ASSIGN(BluetoothLowEnergyDeviceMac);
125 }; 127 };
126 128
127 } // namespace device 129 } // namespace device
128 130
129 #endif // DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_ 131 #endif // DEVICE_BLUETOOTH_BLUETOOTH_LOW_ENERGY_DEVICE_MAC_H_
OLDNEW
« no previous file with comments | « base/mac/sdk_forward_declarations.mm ('k') | device/bluetooth/bluetooth_low_energy_device_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698