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

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

Issue 2924753002: Allow device/bluetooth to build on the macOS 10.13 SDK (Closed)
Patch Set: Use new enum values in tests too Created 3 years, 6 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
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_adapter_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_ADAPTER_MAC_H_ 5 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_MAC_H_
6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_MAC_H_ 6 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_MAC_H_
7 7
8 #include <IOKit/IOReturn.h> 8 #include <IOKit/IOReturn.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 11 matching lines...) Expand all
22 #include "device/bluetooth/bluetooth_export.h" 22 #include "device/bluetooth/bluetooth_export.h"
23 #include "device/bluetooth/bluetooth_low_energy_device_mac.h" 23 #include "device/bluetooth/bluetooth_low_energy_device_mac.h"
24 #include "device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h" 24 #include "device/bluetooth/bluetooth_low_energy_discovery_manager_mac.h"
25 #include "device/bluetooth/bluetooth_uuid.h" 25 #include "device/bluetooth/bluetooth_uuid.h"
26 26
27 @class CBUUID; 27 @class CBUUID;
28 @class IOBluetoothDevice; 28 @class IOBluetoothDevice;
29 @class NSArray; 29 @class NSArray;
30 @class NSDate; 30 @class NSDate;
31 31
32 #if !defined(MAC_OS_X_VERSION_10_13)
33
34 // The 10.13 SDK deprecates the CBCentralManagerState enum. When building
35 // against older SDKs, define the new enum in terms of the deprecated one.
36 using CBManagerState = CBCentralManagerState;
37 constexpr CBManagerState CBManagerStateUnknown = CBCentralManagerStateUnknown;
38 constexpr CBManagerState CBManagerStateResetting =
39 CBCentralManagerStateResetting;
40 constexpr CBManagerState CBManagerStateUnsupported =
41 CBCentralManagerStateUnsupported;
42 constexpr CBManagerState CBManagerStateUnauthorized =
43 CBCentralManagerStateUnauthorized;
44 constexpr CBManagerState CBManagerStatePoweredOff =
45 CBCentralManagerStatePoweredOff;
46 constexpr CBManagerState CBManagerStatePoweredOn =
47 CBCentralManagerStatePoweredOn;
48
49 #endif // MAC_OS_X_VERSION_10_13
50
32 namespace base { 51 namespace base {
33 52
34 class SequencedTaskRunner; 53 class SequencedTaskRunner;
35 54
36 } // namespace base 55 } // namespace base
37 56
38 @class BluetoothLowEnergyCentralManagerDelegate; 57 @class BluetoothLowEnergyCentralManagerDelegate;
39 58
40 namespace device { 59 namespace device {
41 60
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 scoped_refptr<base::SequencedTaskRunner> ui_task_runner_; 247 scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
229 248
230 base::WeakPtrFactory<BluetoothAdapterMac> weak_ptr_factory_; 249 base::WeakPtrFactory<BluetoothAdapterMac> weak_ptr_factory_;
231 250
232 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterMac); 251 DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterMac);
233 }; 252 };
234 253
235 } // namespace device 254 } // namespace device
236 255
237 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_MAC_H_ 256 #endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | device/bluetooth/bluetooth_adapter_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698