| Index: device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.h
|
| diff --git a/chromeos/dbus/bluetooth_media_endpoint_service_provider.h b/device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.h
|
| similarity index 91%
|
| rename from chromeos/dbus/bluetooth_media_endpoint_service_provider.h
|
| rename to device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.h
|
| index fffaa5330d6f4308a52ee8b3ca5e19ba989590fd..df17f092e6a371b7fc6c3fc4f645215dd57fa2a7 100644
|
| --- a/chromeos/dbus/bluetooth_media_endpoint_service_provider.h
|
| +++ b/device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.h
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROMEOS_DBUS_BLUETOOTH_MEDIA_ENDPOINT_SERVICE_PROVIDER_H_
|
| -#define CHROMEOS_DBUS_BLUETOOTH_MEDIA_ENDPOINT_SERVICE_PROVIDER_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_MEDIA_ENDPOINT_SERVICE_PROVIDER_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_MEDIA_ENDPOINT_SERVICE_PROVIDER_H_
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| -#include "chromeos/chromeos_export.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/message.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_export.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // BluetoothMediaEndpointServiceProvider is used to provide a D-Bus object that
|
| // the Bluetooth daemon can commuicate with to serve as a media source/sink.
|
| @@ -27,7 +27,7 @@ namespace chromeos {
|
| // Bluetooth daemon will make calls to this endpoint object and they will be
|
| // passed to user's Delegate object for handling. For SelectConfiguration method
|
| // the response is returned using the SelectConfiguration callback.
|
| -class CHROMEOS_EXPORT BluetoothMediaEndpointServiceProvider {
|
| +class DEVICE_BLUETOOTH_EXPORT BluetoothMediaEndpointServiceProvider {
|
| public:
|
| // Delegate is the interface for reacting to endpoint requests. User
|
| // applications will implement this interface to handle either A2DP Sink or
|
| @@ -35,7 +35,7 @@ class CHROMEOS_EXPORT BluetoothMediaEndpointServiceProvider {
|
| class Delegate {
|
| public:
|
| // Transport-specific properties.
|
| - struct CHROMEOS_EXPORT TransportProperties {
|
| + struct DEVICE_BLUETOOTH_EXPORT TransportProperties {
|
| TransportProperties();
|
| ~TransportProperties();
|
|
|
| @@ -128,6 +128,6 @@ class CHROMEOS_EXPORT BluetoothMediaEndpointServiceProvider {
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothMediaEndpointServiceProvider);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_BLUETOOTH_MEDIA_ENDPOINT_SERVICE_PROVIDER_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_MEDIA_ENDPOINT_SERVICE_PROVIDER_H_
|
|
|