Index: device/bluetooth/bluetooth_audio_sink_chromeos.h |
diff --git a/device/bluetooth/bluetooth_audio_sink_chromeos.h b/device/bluetooth/bluetooth_audio_sink_chromeos.h |
index 3f9f839ddaebea0fd2e287be735849aa6ef202f1..8561fd962ca7ebf5acea6eed79a289aa338b82f6 100644 |
--- a/device/bluetooth/bluetooth_audio_sink_chromeos.h |
+++ b/device/bluetooth/bluetooth_audio_sink_chromeos.h |
@@ -18,12 +18,13 @@ |
#include "dbus/file_descriptor.h" |
#include "dbus/object_path.h" |
#include "device/bluetooth/bluetooth_adapter.h" |
-#include "device/bluetooth/bluetooth_adapter_chromeos.h" |
#include "device/bluetooth/bluetooth_audio_sink.h" |
#include "device/bluetooth/bluetooth_export.h" |
namespace chromeos { |
+class BluetoothAdapterChromeOS; |
+ |
class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS |
: public device::BluetoothAudioSink, |
public device::BluetoothAdapter::Observer, |
@@ -39,11 +40,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS |
device::BluetoothAudioSink::State GetState() const override; |
uint16_t GetVolume() const override; |
- // device::BluetoothAdapter::Observer overrides. |
+ // device::BluetoothAdapter::Observer override. |
Ben Chan
2015/01/28 15:54:27
this change is probably not necessary. see // Blue
Miao
2015/01/28 22:34:20
Done.
|
void AdapterPresentChanged(device::BluetoothAdapter* adapter, |
bool present) override; |
- void AdapterPoweredChanged(device::BluetoothAdapter* adapter, |
- bool powered) override; |
// BluetoothMediaClient::Observer overrides. |
void MediaRemoved(const dbus::ObjectPath& object_path) override; |
@@ -88,6 +87,14 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS |
// updated. |
void VolumeChanged(uint16_t volume); |
+ // Called when the registration of Media Endpoint has succeeded. |
+ void OnRegisterSucceeded(const base::Closure& callback); |
+ |
+ // Called when the registration of Media Endpoint failed. |
+ void OnRegisterFailed(const BluetoothAudioSink::ErrorCallback& error_back, |
Ben Chan
2015/01/28 15:54:27
error_back?
Miao
2015/01/28 22:34:21
s/error_back/error_callback
|
+ const std::string& error_name, |
+ const std::string& error_message); |
+ |
// Reads from the file descriptor acquired via Media Transport object and |
// notify |observer_| while the audio data is available. |
void ReadFromFD(); |
@@ -96,12 +103,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS |
// device. |
device::BluetoothAudioSink::State state_; |
- // Indicates whether the adapter is present. |
- bool present_; |
- |
- // Indicates whether the adapter is powered. |
- bool powered_; |
- |
// The volume control by the remote device during the streaming. |
uint16_t volume_; |