| Index: device/bluetooth/bluetooth_advertisement_chromeos.h
|
| diff --git a/device/bluetooth/bluetooth_advertisement_chromeos.h b/device/bluetooth/bluetooth_advertisement_chromeos.h
|
| index aeb59b7c17d96e3557812db1c323de079835a434..44abec27e12d2a8d9c3851534e574d8685d9ac62 100644
|
| --- a/device/bluetooth/bluetooth_advertisement_chromeos.h
|
| +++ b/device/bluetooth/bluetooth_advertisement_chromeos.h
|
| @@ -6,21 +6,24 @@
|
| #define DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_CHROMEOS_H_
|
|
|
| #include "base/macros.h"
|
| -#include "chromeos/dbus/bluetooth_le_advertisement_service_provider.h"
|
| #include "device/bluetooth/bluetooth_adapter.h"
|
| #include "device/bluetooth/bluetooth_advertisement.h"
|
| #include "device/bluetooth/bluetooth_export.h"
|
| +#include "device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h"
|
| +
|
| +namespace bluez {
|
| +class BluetoothLEAdvertisementServiceProvider;
|
| +}
|
|
|
| namespace chromeos {
|
|
|
| -class BluetoothLEAdvertisementServiceProvider;
|
| class BluetoothAdapterChromeOS;
|
|
|
| // The BluetoothAdvertisementChromeOS class implements BluetoothAdvertisement
|
| // for the Chrome OS platform.
|
| class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisementChromeOS
|
| : public device::BluetoothAdvertisement,
|
| - public BluetoothLEAdvertisementServiceProvider::Delegate {
|
| + public bluez::BluetoothLEAdvertisementServiceProvider::Delegate {
|
| public:
|
| BluetoothAdvertisementChromeOS(
|
| scoped_ptr<device::BluetoothAdvertisement::Data> data,
|
| @@ -30,7 +33,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisementChromeOS
|
| void Unregister(const SuccessCallback& success_callback,
|
| const ErrorCallback& error_callback) override;
|
|
|
| - // BluetoothLEAdvertisementServiceProvider::Delegate overrides:
|
| + // bluez::BluetoothLEAdvertisementServiceProvider::Delegate overrides:
|
| void Released() override;
|
|
|
| void Register(
|
| @@ -40,7 +43,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisementChromeOS
|
|
|
| // Used from tests to be able to trigger events on the fake advertisement
|
| // provider.
|
| - BluetoothLEAdvertisementServiceProvider* provider() {
|
| + bluez::BluetoothLEAdvertisementServiceProvider* provider() {
|
| return provider_.get();
|
| }
|
|
|
| @@ -49,7 +52,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdvertisementChromeOS
|
|
|
| // Adapter this advertisement is advertising on.
|
| scoped_refptr<BluetoothAdapterChromeOS> adapter_;
|
| - scoped_ptr<BluetoothLEAdvertisementServiceProvider> provider_;
|
| + scoped_ptr<bluez::BluetoothLEAdvertisementServiceProvider> provider_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothAdvertisementChromeOS);
|
| };
|
|
|