services/device/device_service.cc - Issue 2818673003: [DeviceService] Expose battery monitoring solely via 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/device_service.cc

Issue 2818673003: [DeviceService] Expose battery monitoring solely via the Device Service (Closed)

Patch Set: Rebase only Created 3 years, 8 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:

Index: services/device/device_service.cc

diff --git a/services/device/device_service.cc b/services/device/device_service.cc

index 106a29a235857079285b6c8c35b6fecc5b9ec235..51df84ba498093a80b60a838567eb9b8558e53b7 100644

--- a/services/device/device_service.cc

+++ b/services/device/device_service.cc

@@ -12,9 +12,6 @@

#include "base/memory/weak_ptr.h"

#include "base/single_thread_task_runner.h"

#include "base/threading/thread_task_runner_handle.h"

-#include "device/battery/battery_monitor.mojom.h"

-#include "device/battery/battery_monitor_impl.h"

-#include "device/battery/battery_status_service.h"

#include "device/generic_sensor/sensor_provider_impl.h"

#include "device/sensors/device_sensor_host.h"

#include "device/wake_lock/wake_lock_context_provider.h"

@@ -22,6 +19,7 @@

#include "services/device/fingerprint/fingerprint.h"

#include "services/device/power_monitor/power_monitor_message_broadcaster.h"

#include "services/device/public/cpp/device_features.h"

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

#include "services/device/time_zone_monitor/time_zone_monitor.h"

#include "services/service_manager/public/cpp/interface_registry.h"

#include "services/service_manager/public/cpp/service_info.h"

@@ -34,6 +32,8 @@

#include "services/device/android/register_jni.h"

#include "services/device/screen_orientation/screen_orientation_listener_android.h"

#else

+#include "services/device/battery/battery_monitor_impl.h"

+#include "services/device/battery/battery_status_service.h"

#include "services/device/vibration/vibration_manager_impl.h"

#endif