| Index: device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.h
|
| diff --git a/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.h b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.h
|
| similarity index 92%
|
| rename from chromeos/dbus/bluetooth_gatt_characteristic_service_provider.h
|
| rename to device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.h
|
| index 174a9082d44abd3eaf6211954567912cac79deab..ad5d999ff755252924fd8ac50162559813736490 100644
|
| --- a/chromeos/dbus/bluetooth_gatt_characteristic_service_provider.h
|
| +++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_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_GATT_CHARACTERISTIC_SERVICE_PROVIDER_H_
|
| -#define CHROMEOS_DBUS_BLUETOOTH_GATT_CHARACTERISTIC_SERVICE_PROVIDER_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_CHARACTERISTIC_SERVICE_PROVIDER_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_CHARACTERISTIC_SERVICE_PROVIDER_H_
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/callback.h"
|
| -#include "chromeos/chromeos_export.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_export.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // BluetoothGattCharacteristicServiceProvider is used to provide a D-Bus object
|
| // that represents a local GATT characteristic that the Bluetooth daemon can
|
| @@ -30,7 +30,7 @@ namespace chromeos {
|
| // mandatory during initialization. In addition, a "SendValueChanged" method is
|
| // provided, which emits a DBus.Properties.PropertyChanged signal for the
|
| // "Value" property.
|
| -class CHROMEOS_EXPORT BluetoothGattCharacteristicServiceProvider {
|
| +class DEVICE_BLUETOOTH_EXPORT BluetoothGattCharacteristicServiceProvider {
|
| public:
|
| // Interface for reacting to GATT characteristic value requests.
|
| class Delegate {
|
| @@ -108,6 +108,6 @@ class CHROMEOS_EXPORT BluetoothGattCharacteristicServiceProvider {
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothGattCharacteristicServiceProvider);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_BLUETOOTH_GATT_CHARACTERISTIC_SERVICE_PROVIDER_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_CHARACTERISTIC_SERVICE_PROVIDER_H_
|
|
|