Index: device/bluetooth/bluetooth_device_mac.mm |
diff --git a/device/bluetooth/bluetooth_device_mac.mm b/device/bluetooth/bluetooth_device_mac.mm |
index a2f3274dbf8ec525f52ebfb4acbf25b68012020b..8effb576e260df9077e6d622cb9348f6401f7318 100644 |
--- a/device/bluetooth/bluetooth_device_mac.mm |
+++ b/device/bluetooth/bluetooth_device_mac.mm |
@@ -6,7 +6,8 @@ |
#include "device/bluetooth/bluetooth_adapter_mac.h" |
-static NSString* const kErrorDomain = @"ConnectErrorCode"; |
+static NSString* const kConnectErrorDomain = @"ConnectErrorCode"; |
+static NSString* const kGattErrorDomain = @"GattErrorCode"; |
namespace device { |
@@ -19,12 +20,14 @@ BluetoothDeviceMac::~BluetoothDeviceMac() { |
NSError* BluetoothDeviceMac::GetNSErrorFromConnectErrorCode( |
BluetoothDevice::ConnectErrorCode error_code) { |
// TODO(http://crbug.com/585894): Need to convert the error. |
msarda
2016/06/27 11:52:47
It looks like the error is converted here. Does th
jlebel
2016/06/27 12:09:20
It would be nicer to use a CBError code.
|
- return [NSError errorWithDomain:kErrorDomain code:error_code userInfo:nil]; |
+ return [NSError errorWithDomain:kConnectErrorDomain |
+ code:error_code |
+ userInfo:nil]; |
} |
BluetoothDevice::ConnectErrorCode |
BluetoothDeviceMac::GetConnectErrorCodeFromNSError(NSError* error) { |
- if ([error.domain isEqualToString:kErrorDomain]) { |
+ if ([error.domain isEqualToString:kConnectErrorDomain]) { |
BluetoothDevice::ConnectErrorCode connect_error_code = |
(BluetoothDevice::ConnectErrorCode)error.code; |
if (connect_error_code >= 0 || |
@@ -38,4 +41,27 @@ BluetoothDeviceMac::GetConnectErrorCodeFromNSError(NSError* error) { |
return BluetoothDevice::ERROR_FAILED; |
} |
+NSError* BluetoothDeviceMac::GetNSErrorFromGattErrorCode( |
+ BluetoothGattService::GattErrorCode error_code) { |
+ // TODO(http://crbug.com/619595): Need to convert the error. |
+ return |
+ [NSError errorWithDomain:kGattErrorDomain code:error_code userInfo:nil]; |
+} |
+ |
+BluetoothGattService::GattErrorCode |
+BluetoothDeviceMac::GetGattErrorCodeFromNSError(NSError* error) { |
+ if ([error.domain isEqualToString:kGattErrorDomain]) { |
+ BluetoothGattService::GattErrorCode gatt_error_code = |
+ (BluetoothGattService::GattErrorCode)error.code; |
+ if (gatt_error_code >= 0 || |
+ gatt_error_code <= BluetoothGattService::GATT_ERROR_NOT_SUPPORTED) { |
+ return gatt_error_code; |
+ } |
+ DCHECK(false); |
msarda
2016/06/27 11:52:47
Use NOTREACHED() (equivalent with DCHECK(false) bu
jlebel
2016/06/27 12:09:20
Done.
|
+ return BluetoothGattService::GATT_ERROR_FAILED; |
+ } |
+ // TODO(http://crbug.com/619595): Need to convert the error. |
msarda
2016/06/27 11:52:47
I do not understand this TODO. It looks like the e
jlebel
2016/06/27 12:09:20
Updating the comment to:
Need to convert the error
|
+ return BluetoothGattService::GATT_ERROR_FAILED; |
+} |
+ |
} // namespace device |