| Index: services/device/generic_sensor/linux/sensor_data_linux.h
|
| diff --git a/device/generic_sensor/linux/sensor_data_linux.h b/services/device/generic_sensor/linux/sensor_data_linux.h
|
| similarity index 85%
|
| rename from device/generic_sensor/linux/sensor_data_linux.h
|
| rename to services/device/generic_sensor/linux/sensor_data_linux.h
|
| index 5f82898b93f4a4f2869d661d71cec67fb1c3c0e4..3e485b9572c619d5acaa8fb33a45dc2d361e284f 100644
|
| --- a/device/generic_sensor/linux/sensor_data_linux.h
|
| +++ b/services/device/generic_sensor/linux/sensor_data_linux.h
|
| @@ -2,11 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_
|
| -#define DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_
|
| +#ifndef SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_
|
| +#define SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_
|
|
|
| -#include "device/generic_sensor/generic_sensor_export.h"
|
| -#include "device/generic_sensor/public/interfaces/sensor.mojom.h"
|
| +#include "services/device/public/interfaces/sensor.mojom.h"
|
|
|
| namespace device {
|
|
|
| @@ -18,7 +17,7 @@ struct SensorReading;
|
| // SensorDeviceManager receives a udev device, it uses this structure to
|
| // identify what type of sensor that is and creates a SensorInfoLinux structure
|
| // that holds all the necessary information to create a PlatformSensorLinux.
|
| -struct DEVICE_GENERIC_SENSOR_EXPORT SensorPathsLinux {
|
| +struct SensorPathsLinux {
|
| using ReaderFunctor = base::Callback<
|
| void(double scaling, double offset, SensorReading& reading)>;
|
|
|
| @@ -44,8 +43,7 @@ struct DEVICE_GENERIC_SENSOR_EXPORT SensorPathsLinux {
|
| };
|
|
|
| // Initializes sensor data according to |type|.
|
| -bool DEVICE_GENERIC_SENSOR_EXPORT InitSensorData(mojom::SensorType type,
|
| - SensorPathsLinux* data);
|
| +bool InitSensorData(mojom::SensorType type, SensorPathsLinux* data);
|
|
|
| // This structure represents an iio device, which info is taken
|
| // from udev service. If a client requests a sensor from a provider,
|
| @@ -79,4 +77,4 @@ struct SensorInfoLinux {
|
|
|
| } // namespace device
|
|
|
| -#endif // DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_
|
| +#endif // SERVICES_DEVICE_GENERIC_SENSOR_LINUX_SENSOR_DATA_LINUX_H_
|
|
|