device/bluetooth/bluetooth_adapter_mac.mm - Issue 2271653006: base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/bluetooth_adapter_mac.mm

Issue 2271653006: base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 4 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 side-by-side diff with in-line comments

Download patch

« base/mac/mac_util.mm ('K') | « content/renderer/renderer_main_platform_delegate_mac.mm ('k') | sandbox/mac/bootstrap_sandbox_unittest.mm » ('j') | third_party/WebKit/Source/platform/mac/VersionUtilMac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_adapter_mac.mm

diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm

index ef4a20dee2da1156e992a84add68576b47755754..98ce4d6c1c777c15305b15baaafc77b3620b5fec 100644

--- a/device/bluetooth/bluetooth_adapter_mac.mm

+++ b/device/bluetooth/bluetooth_adapter_mac.mm

@@ -68,7 +68,7 @@ base::WeakPtr<BluetoothAdapterMac> BluetoothAdapterMac::CreateAdapterForTest(

// static

BluetoothUUID BluetoothAdapterMac::BluetoothUUIDWithCBUUID(CBUUID* uuid) {

// UUIDString only available OS X >= 10.10.

- DCHECK(base::mac::IsOSYosemiteOrLater());

+ DCHECK(base::mac::IsAtLeastOS10_10());

std::string uuid_c_string = base::SysNSStringToUTF8([uuid UUIDString]);

return device::BluetoothUUID(uuid_c_string);

}

@@ -241,7 +241,7 @@ void BluetoothAdapterMac::DeviceConnected(IOBluetoothDevice* device) {

// static

bool BluetoothAdapterMac::IsLowEnergyAvailable() {

- return base::mac::IsOSYosemiteOrLater();

+ return base::mac::IsAtLeastOS10_10();

}

void BluetoothAdapterMac::RemovePairingDelegateInternal(