| 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" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "services/service_manager/public/cpp/service_info.h" | 28 #include "services/service_manager/public/cpp/service_info.h" |
| 29 #include "ui/gfx/native_widget_types.h" | 29 #include "ui/gfx/native_widget_types.h" |
| 30 | 30 |
| 31 #if defined(OS_ANDROID) | 31 #if defined(OS_ANDROID) |
| 32 #include "base/android/context_utils.h" | 32 #include "base/android/context_utils.h" |
| 33 #include "base/android/jni_android.h" | 33 #include "base/android/jni_android.h" |
| 34 #include "jni/InterfaceRegistrar_jni.h" | 34 #include "jni/InterfaceRegistrar_jni.h" |
| 35 #include "services/device/android/register_jni.h" | 35 #include "services/device/android/register_jni.h" |
| 36 #include "services/device/screen_orientation/screen_orientation_listener_android
.h" | 36 #include "services/device/screen_orientation/screen_orientation_listener_android
.h" |
| 37 #else | 37 #else |
| 38 #include "device/vibration/vibration_manager_impl.h" | 38 #include "services/device/vibration/vibration_manager_impl.h" |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 namespace device { | 41 namespace device { |
| 42 | 42 |
| 43 #if defined(OS_ANDROID) | 43 #if defined(OS_ANDROID) |
| 44 std::unique_ptr<service_manager::Service> CreateDeviceService( | 44 std::unique_ptr<service_manager::Service> CreateDeviceService( |
| 45 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, | 45 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, |
| 46 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, | 46 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
| 47 const WakeLockContextCallback& wake_lock_context_callback) { | 47 const WakeLockContextCallback& wake_lock_context_callback) { |
| 48 if (!EnsureJniRegistered()) { | 48 if (!EnsureJniRegistered()) { |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 java_interface_provider_.Bind(std::move(provider)); | 256 java_interface_provider_.Bind(std::move(provider)); |
| 257 | 257 |
| 258 java_interface_provider_initialized_ = true; | 258 java_interface_provider_initialized_ = true; |
| 259 } | 259 } |
| 260 | 260 |
| 261 return &java_interface_provider_; | 261 return &java_interface_provider_; |
| 262 } | 262 } |
| 263 #endif | 263 #endif |
| 264 | 264 |
| 265 } // namespace device | 265 } // namespace device |
| OLD | NEW |