| 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..f454792b6d2ab03fd2c77b69796ae9f93b574c1b 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,10 +104,17 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothLowEnergyDeviceMac
|
| private:
|
| friend class BluetoothAdapterMac;
|
| friend class BluetoothAdapterMacTest;
|
| + friend class BluetoothTestMac;
|
| +
|
| + BluetoothAdapterMac* GetBluetoothAdapterMac();
|
| + CBPeripheral* GetPeripheral();
|
|
|
| // Equivalent to [peripheral_ state]. Allows compilation on OS X 10.6.
|
| CBPeripheralState GetPeripheralState() const;
|
|
|
| + // Called by the adapter when CoreBluetooth calls CBCentralManager's delegate.
|
| + void GattConnected();
|
| +
|
| // CoreBluetooth data structure.
|
| base::scoped_nsobject<CBPeripheral> peripheral_;
|
|
|
|
|