| Index: device/bluetooth/bluetooth_remote_gatt_service_android.cc
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_service_android.cc b/device/bluetooth/bluetooth_remote_gatt_service_android.cc
|
| index 935dfaa540099bfb1d3a7182f31c0a2bf1c5b5eb..61f3d1c788352cc2b0adc9175d0eada2eb5ca578 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_service_android.cc
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_service_android.cc
|
| @@ -55,11 +55,11 @@ BluetoothRemoteGattServiceAndroid::GetJavaObject() {
|
| }
|
|
|
| // static
|
| -BluetoothGattService::GattErrorCode
|
| +BluetoothRemoteGattService::GattErrorCode
|
| BluetoothRemoteGattServiceAndroid::GetGattErrorCode(int bluetooth_gatt_code) {
|
| DCHECK(bluetooth_gatt_code != 0) << "Only errors valid. 0 == GATT_SUCCESS.";
|
|
|
| - // TODO(scheib) Create new BluetoothGattService::GattErrorCode enums for
|
| + // TODO(scheib) Create new BluetoothRemoteGattService::GattErrorCode enums for
|
| // android values not yet represented. http://crbug.com/548498
|
| switch (bluetooth_gatt_code) { // android.bluetooth.BluetoothGatt values:
|
| case 0x00000101: // GATT_FAILURE
|
| @@ -74,14 +74,14 @@ BluetoothRemoteGattServiceAndroid::GetGattErrorCode(int bluetooth_gatt_code) {
|
| return GATT_ERROR_NOT_PERMITTED;
|
| default:
|
| VLOG(1) << "Unhandled status: " << bluetooth_gatt_code;
|
| - return BluetoothGattService::GATT_ERROR_UNKNOWN;
|
| + return BluetoothRemoteGattService::GATT_ERROR_UNKNOWN;
|
| }
|
| }
|
|
|
| // static
|
| int BluetoothRemoteGattServiceAndroid::GetAndroidErrorCode(
|
| - BluetoothGattService::GattErrorCode error_code) {
|
| - // TODO(scheib) Create new BluetoothGattService::GattErrorCode enums for
|
| + BluetoothRemoteGattService::GattErrorCode error_code) {
|
| + // TODO(scheib) Create new BluetoothRemoteGattService::GattErrorCode enums for
|
| // android values not yet represented. http://crbug.com/548498
|
| switch (error_code) { // Return values from android.bluetooth.BluetoothGatt:
|
| case GATT_ERROR_UNKNOWN:
|
| @@ -131,22 +131,22 @@ device::BluetoothDevice* BluetoothRemoteGattServiceAndroid::GetDevice() const {
|
| return device_;
|
| }
|
|
|
| -std::vector<device::BluetoothGattCharacteristic*>
|
| +std::vector<device::BluetoothRemoteGattCharacteristic*>
|
| BluetoothRemoteGattServiceAndroid::GetCharacteristics() const {
|
| EnsureCharacteristicsCreated();
|
| - std::vector<device::BluetoothGattCharacteristic*> characteristics;
|
| + std::vector<device::BluetoothRemoteGattCharacteristic*> characteristics;
|
| for (const auto& map_iter : characteristics_)
|
| characteristics.push_back(map_iter.second);
|
| return characteristics;
|
| }
|
|
|
| -std::vector<device::BluetoothGattService*>
|
| +std::vector<device::BluetoothRemoteGattService*>
|
| BluetoothRemoteGattServiceAndroid::GetIncludedServices() const {
|
| NOTIMPLEMENTED();
|
| - return std::vector<device::BluetoothGattService*>();
|
| + return std::vector<device::BluetoothRemoteGattService*>();
|
| }
|
|
|
| -device::BluetoothGattCharacteristic*
|
| +device::BluetoothRemoteGattCharacteristic*
|
| BluetoothRemoteGattServiceAndroid::GetCharacteristic(
|
| const std::string& identifier) const {
|
| EnsureCharacteristicsCreated();
|
| @@ -157,12 +157,12 @@ BluetoothRemoteGattServiceAndroid::GetCharacteristic(
|
| }
|
|
|
| bool BluetoothRemoteGattServiceAndroid::AddCharacteristic(
|
| - device::BluetoothGattCharacteristic* characteristic) {
|
| + device::BluetoothRemoteGattCharacteristic* characteristic) {
|
| return false;
|
| }
|
|
|
| bool BluetoothRemoteGattServiceAndroid::AddIncludedService(
|
| - device::BluetoothGattService* service) {
|
| + device::BluetoothRemoteGattService* service) {
|
| return false;
|
| }
|
|
|
|
|