services/device/public/cpp/generic_sensor/sensor_reading.h - Issue 2865263002: Move //device/generic_sensor to be part of the internal implementation of the Device Service.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: services/device/public/cpp/generic_sensor/sensor_reading.h

Issue 2865263002: Move //device/generic_sensor to be part of the internal implementation of the Device Service. (Closed)

Patch Set: code rebase Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « services/device/public/cpp/generic_sensor/platform_sensor_configuration.cc ('k') | services/device/public/cpp/generic_sensor/sensor_reading.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: services/device/public/cpp/generic_sensor/sensor_reading.h

diff --git a/device/generic_sensor/public/cpp/sensor_reading.h b/services/device/public/cpp/generic_sensor/sensor_reading.h

similarity index 89%

rename from device/generic_sensor/public/cpp/sensor_reading.h

rename to services/device/public/cpp/generic_sensor/sensor_reading.h

index a7048f7a9a348a8b59e7f901d90ee2b0c8db7cbf..699f92da319068c12cb2a5b537137aa0e918bce6 100644

--- a/device/generic_sensor/public/cpp/sensor_reading.h

+++ b/services/device/public/cpp/generic_sensor/sensor_reading.h

@@ -2,12 +2,11 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_

-#define DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_

+#ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_

+#define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_

#include "device/base/synchronization/one_writer_seqlock.h"

-#include "device/generic_sensor/public/cpp/generic_sensor_public_export.h"

-#include "device/generic_sensor/public/interfaces/sensor.mojom.h"

+#include "services/device/public/interfaces/sensor.mojom.h"

namespace device {

@@ -40,7 +39,7 @@ class SensorReadingField {

};

// This structure represents sensor reading data: timestamp and 4 values.

-struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReading {

+struct SensorReading {

SensorReading();

~SensorReading();

SensorReading(const SensorReading& other);

@@ -101,7 +100,7 @@ struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReading {

// This structure represents sensor reading buffer: sensor reading and seqlock

// for synchronization.

-struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReadingSharedBuffer {

+struct SensorReadingSharedBuffer {

SensorReadingSharedBuffer();

~SensorReadingSharedBuffer();

SensorReadingField<OneWriterSeqLock> seqlock;

@@ -113,4 +112,4 @@ struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReadingSharedBuffer {

} // namespace device

-#endif // DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_

+#endif // SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_