device/bluetooth/bluetooth_device_chromeos.cc - Issue 180163009: chrome.bluetooth API improvements.

Unified Diff: device/bluetooth/bluetooth_device_chromeos.cc

Issue 180163009: chrome.bluetooth API improvements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address code review feedback, simplify threading model. Created 6 years, 9 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

« device/bluetooth/bluetooth_adapter_factory.h ('K') | « device/bluetooth/bluetooth_device_chromeos.h ('k') | device/bluetooth/bluetooth_device_mac.h » ('j') | device/bluetooth/bluetooth_socket.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_device_chromeos.cc

diff --git a/device/bluetooth/bluetooth_device_chromeos.cc b/device/bluetooth/bluetooth_device_chromeos.cc

index aa1d66b1859e744bde5eec6a7e369a3a66d8064b..1187825d6e984faf65c7b89250bfc9b6669deefc 100644

--- a/device/bluetooth/bluetooth_device_chromeos.cc

+++ b/device/bluetooth/bluetooth_device_chromeos.cc

@@ -25,6 +25,8 @@ using device::BluetoothDevice;

namespace {

+const char kNotImplemented[] = "Function not yet implemented";

// Histogram enumerations for pairing results.

enum UMAPairingResult {

UMA_PAIRING_RESULT_SUCCESS,

@@ -227,7 +229,7 @@ void BluetoothDeviceChromeOS::GetServiceRecords(

const ServiceRecordsCallback& callback,

const ErrorCallback& error_callback) {

// TODO(keybuk): not implemented; remove

- error_callback.Run();

+ error_callback.Run(kNotImplemented);

keybuk 2014/03/27 20:20:07 Drop this change, this is using ErrorCallback not

rpaquay 2014/03/27 22:00:01 Actually, this method has disappeared after rebasi

}

void BluetoothDeviceChromeOS::ProvidesServiceWithName(

@@ -368,7 +370,7 @@ void BluetoothDeviceChromeOS::ConnectToService(

void BluetoothDeviceChromeOS::ConnectToProfile(

device::BluetoothProfile* profile,

const base::Closure& callback,

- const ErrorCallback& error_callback) {

+ const ConnectToProfileErrorCallback& error_callback) {

BluetoothProfileChromeOS* profile_chromeos =

static_cast<BluetoothProfileChromeOS*>(profile);

VLOG(1) << object_path_.value() << ": Connecting profile: "

@@ -394,14 +396,14 @@ void BluetoothDeviceChromeOS::SetOutOfBandPairingData(

const base::Closure& callback,

const ErrorCallback& error_callback) {

// TODO(keybuk): implement

- error_callback.Run();

+ error_callback.Run(kNotImplemented);

keybuk 2014/03/27 20:20:07 as above

rpaquay 2014/03/27 22:00:01 Done.

}

void BluetoothDeviceChromeOS::ClearOutOfBandPairingData(

const base::Closure& callback,

const ErrorCallback& error_callback) {

// TODO(keybuk): implement

- error_callback.Run();

+ error_callback.Run(kNotImplemented);

keybuk 2014/03/27 20:20:07 as above

rpaquay 2014/03/27 22:00:01 Done.

}

BluetoothPairingChromeOS* BluetoothDeviceChromeOS::BeginPairing(

@@ -564,7 +566,7 @@ void BluetoothDeviceChromeOS::OnDisconnectError(

const std::string& error_message) {

LOG(WARNING) << object_path_.value() << ": Failed to disconnect device: "

<< error_name << ": " << error_message;

- error_callback.Run();

+ error_callback.Run(error_message);

keybuk 2014/03/27 20:20:07 as above

rpaquay 2014/03/27 22:00:01 Done.

}

void BluetoothDeviceChromeOS::OnForgetError(

@@ -573,7 +575,7 @@ void BluetoothDeviceChromeOS::OnForgetError(

const std::string& error_message) {

LOG(WARNING) << object_path_.value() << ": Failed to remove device: "

<< error_name << ": " << error_message;

- error_callback.Run();

+ error_callback.Run(error_message);

keybuk 2014/03/27 20:20:07 as above

rpaquay 2014/03/27 22:00:01 Done.

}

void BluetoothDeviceChromeOS::OnConnectProfile(

@@ -596,7 +598,7 @@ void BluetoothDeviceChromeOS::OnConnectProfileError(

VLOG(1) << object_path_.value() << ": Profile connection failed: "

<< profile_chromeos->uuid() << ": "

<< error_name << ": " << error_message;

- error_callback.Run();

+ error_callback.Run(error_message);

}

} // namespace chromeos