| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "services/device/device_service.h" | 5 #include "services/device/device_service.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
| 11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
| 13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 14 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
| 15 #include "device/generic_sensor/sensor_provider_impl.h" | 15 #include "device/generic_sensor/sensor_provider_impl.h" |
| 16 #include "device/sensors/device_sensor_host.h" | 16 #include "device/sensors/device_sensor_host.h" |
| 17 #include "device/wake_lock/wake_lock_context_provider.h" | 17 #include "device/wake_lock/wake_lock_context_provider.h" |
| 18 #include "mojo/public/cpp/system/message_pipe.h" | 18 #include "mojo/public/cpp/system/message_pipe.h" |
| 19 #include "services/device/fingerprint/fingerprint.h" | 19 #include "services/device/fingerprint/fingerprint.h" |
| 20 #include "services/device/power_monitor/power_monitor_message_broadcaster.h" | 20 #include "services/device/power_monitor/power_monitor_message_broadcaster.h" |
| 21 #include "services/device/public/cpp/device_features.h" | 21 #include "services/device/public/cpp/device_features.h" |
| 22 #include "services/device/public/interfaces/battery_monitor.mojom.h" | 22 #include "services/device/public/interfaces/battery_monitor.mojom.h" |
| 23 #include "services/device/time_zone_monitor/time_zone_monitor.h" | 23 #include "services/device/time_zone_monitor/time_zone_monitor.h" |
| 24 #include "services/service_manager/public/cpp/bind_source_info.h" | 24 #include "services/service_manager/public/cpp/bind_source_info.h" |
| 25 #include "ui/gfx/native_widget_types.h" | 25 #include "ui/gfx/native_widget_types.h" |
| 26 | 26 |
| 27 #if defined(OS_ANDROID) | 27 #if defined(OS_ANDROID) |
| 28 #include "base/android/context_utils.h" | |
| 29 #include "base/android/jni_android.h" | 28 #include "base/android/jni_android.h" |
| 30 #include "jni/InterfaceRegistrar_jni.h" | 29 #include "jni/InterfaceRegistrar_jni.h" |
| 31 #include "services/device/android/register_jni.h" | 30 #include "services/device/android/register_jni.h" |
| 32 #include "services/device/screen_orientation/screen_orientation_listener_android
.h" | 31 #include "services/device/screen_orientation/screen_orientation_listener_android
.h" |
| 33 #else | 32 #else |
| 34 #include "services/device/battery/battery_monitor_impl.h" | 33 #include "services/device/battery/battery_monitor_impl.h" |
| 35 #include "services/device/battery/battery_status_service.h" | 34 #include "services/device/battery/battery_status_service.h" |
| 36 #include "services/device/vibration/vibration_manager_impl.h" | 35 #include "services/device/vibration/vibration_manager_impl.h" |
| 37 #endif | 36 #endif |
| 38 | 37 |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 WakeLockContextProvider::Create(std::move(request), file_task_runner_, | 249 WakeLockContextProvider::Create(std::move(request), file_task_runner_, |
| 251 wake_lock_context_callback_); | 250 wake_lock_context_callback_); |
| 252 } | 251 } |
| 253 | 252 |
| 254 #if defined(OS_ANDROID) | 253 #if defined(OS_ANDROID) |
| 255 service_manager::InterfaceProvider* DeviceService::GetJavaInterfaceProvider() { | 254 service_manager::InterfaceProvider* DeviceService::GetJavaInterfaceProvider() { |
| 256 if (!java_interface_provider_initialized_) { | 255 if (!java_interface_provider_initialized_) { |
| 257 service_manager::mojom::InterfaceProviderPtr provider; | 256 service_manager::mojom::InterfaceProviderPtr provider; |
| 258 JNIEnv* env = base::android::AttachCurrentThread(); | 257 JNIEnv* env = base::android::AttachCurrentThread(); |
| 259 Java_InterfaceRegistrar_createInterfaceRegistryForContext( | 258 Java_InterfaceRegistrar_createInterfaceRegistryForContext( |
| 260 env, mojo::MakeRequest(&provider).PassMessagePipe().release().value(), | 259 env, mojo::MakeRequest(&provider).PassMessagePipe().release().value()); |
| 261 base::android::GetApplicationContext()); | |
| 262 java_interface_provider_.Bind(std::move(provider)); | 260 java_interface_provider_.Bind(std::move(provider)); |
| 263 | 261 |
| 264 java_interface_provider_initialized_ = true; | 262 java_interface_provider_initialized_ = true; |
| 265 } | 263 } |
| 266 | 264 |
| 267 return &java_interface_provider_; | 265 return &java_interface_provider_; |
| 268 } | 266 } |
| 269 #endif | 267 #endif |
| 270 | 268 |
| 271 } // namespace device | 269 } // namespace device |
| OLD | NEW |