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

Unified Diff: device/bluetooth/bluetooth_low_energy_device_mac.h

Issue 1538173003: Implementing GATT connection/disconnect on OS X. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sorting methods between bluetooth_adapter_mac.h and bluetooth_adapter_mac.mm Created 4 years, 10 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
Index: device/bluetooth/bluetooth_low_energy_device_mac.h
diff --git a/device/bluetooth/bluetooth_low_energy_device_mac.h b/device/bluetooth/bluetooth_low_energy_device_mac.h
index 19cbb0187e8f78ba22b36c7b8ef55bad0d1f3cb9..f9549a1f3d2ffaad2f05f41bf487cd52ee104efb 100644
--- a/device/bluetooth/bluetooth_low_energy_device_mac.h
+++ b/device/bluetooth/bluetooth_low_energy_device_mac.h
@@ -78,9 +78,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
const device::BluetoothUUID& uuid,
const ConnectToServiceCallback& callback,
const ConnectToServiceErrorCallback& error_callback) override;
- void CreateGattConnection(
- const GattConnectionCallback& callback,
- const ConnectErrorCallback& error_callback) override;
// BluetoothDeviceMac override.
NSDate* GetLastUpdateTime() const override;
@@ -107,6 +104,19 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
private:
friend class BluetoothAdapterMac;
friend class BluetoothAdapterMacTest;
+ friend class BluetoothTestMac;
+
+ // Returns the Bluetooth adapter.
+ BluetoothAdapterMac* GetBluetoothAdapterMac();
scheib 2016/02/10 18:59:45 GetMacAdapter (this will now match a patch just la
jlebel 2016/02/10 21:20:07 Done.
+
+ // Returns the CoreBluetooth Peripheral.
+ CBPeripheral* GetPeripheral();
+
+ // Callback used when the CoreBluetooth Peripheral is disconnected.
+ void DidDisconnectPeripheral();
+
+ // Called by the adapter when CoreBluetooth calls CBCentralManager's delegate.
+ void GattConnected();
// Equivalent to [peripheral_ state]. Allows compilation on OS X 10.6.
CBPeripheralState GetPeripheralState() const;

Powered by Google App Engine
This is Rietveld 408576698