Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Side by Side Diff: content/app/android/library_loader_hooks.cc

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 unified diff | Download patch
« no previous file with comments | « content/app/DEPS ('k') | content/browser/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/app/android/library_loader_hooks.h" 5 #include "content/app/android/library_loader_hooks.h"
6 6
7 #include "base/android/base_jni_registrar.h" 7 #include "base/android/base_jni_registrar.h"
8 #include "base/android/command_line_android.h" 8 #include "base/android/command_line_android.h"
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_registrar.h" 10 #include "base/android/jni_registrar.h"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/android/library_loader/library_loader_hooks.h" 12 #include "base/android/library_loader/library_loader_hooks.h"
13 #include "base/base_switches.h" 13 #include "base/base_switches.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/trace_event/trace_event.h" 18 #include "base/trace_event/trace_event.h"
19 #include "base/tracked_objects.h" 19 #include "base/tracked_objects.h"
20 #include "components/tracing/common/trace_startup.h" 20 #include "components/tracing/common/trace_startup.h"
21 #include "content/app/android/app_jni_registrar.h" 21 #include "content/app/android/app_jni_registrar.h"
22 #include "content/browser/android/browser_jni_registrar.h" 22 #include "content/browser/android/browser_jni_registrar.h"
23 #include "content/common/android/common_jni_registrar.h" 23 #include "content/common/android/common_jni_registrar.h"
24 #include "content/common/content_constants_internal.h" 24 #include "content/common/content_constants_internal.h"
25 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
26 #include "content/public/common/result_codes.h" 26 #include "content/public/common/result_codes.h"
27 #include "device/bluetooth/android/bluetooth_jni_registrar.h" 27 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
28 #include "device/gamepad/android/gamepad_jni_registrar.h" 28 #include "device/gamepad/android/gamepad_jni_registrar.h"
29 #include "device/generic_sensor/android/sensors_jni_registrar.h"
30 #include "device/geolocation/android/geolocation_jni_registrar.h" 29 #include "device/geolocation/android/geolocation_jni_registrar.h"
31 #include "device/sensors/android/device_sensor_jni_registrar.h" 30 #include "device/sensors/android/device_sensor_jni_registrar.h"
32 #include "device/usb/android/usb_jni_registrar.h" 31 #include "device/usb/android/usb_jni_registrar.h"
33 #include "media/base/android/media_jni_registrar.h" 32 #include "media/base/android/media_jni_registrar.h"
34 #include "media/capture/content/android/screen_capture_jni_registrar.h" 33 #include "media/capture/content/android/screen_capture_jni_registrar.h"
35 #include "media/capture/video/android/capture_jni_registrar.h" 34 #include "media/capture/video/android/capture_jni_registrar.h"
36 #include "media/midi/midi_jni_registrar.h" 35 #include "media/midi/midi_jni_registrar.h"
37 #include "mojo/android/system/mojo_jni_registrar.h" 36 #include "mojo/android/system/mojo_jni_registrar.h"
38 #include "net/android/net_jni_registrar.h" 37 #include "net/android/net_jni_registrar.h"
39 #include "ui/android/ui_android_jni_registrar.h" 38 #include "ui/android/ui_android_jni_registrar.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 82
84 if (!device::android::RegisterDeviceSensorJni(env)) 83 if (!device::android::RegisterDeviceSensorJni(env))
85 return false; 84 return false;
86 85
87 if (!device::android::RegisterGamepadJni(env)) 86 if (!device::android::RegisterGamepadJni(env))
88 return false; 87 return false;
89 88
90 if (!device::android::RegisterGeolocationJni(env)) 89 if (!device::android::RegisterGeolocationJni(env))
91 return false; 90 return false;
92 91
93 if (!device::android::RegisterSensorsJni(env))
94 return false;
95
96 if (!device::android::RegisterUsbJni(env)) 92 if (!device::android::RegisterUsbJni(env))
97 return false; 93 return false;
98 94
99 if (!media::RegisterJni(env)) 95 if (!media::RegisterJni(env))
100 return false; 96 return false;
101 97
102 if (!media::RegisterCaptureJni(env)) 98 if (!media::RegisterCaptureJni(env))
103 return false; 99 return false;
104 100
105 if (!media::RegisterScreenCaptureJni(env)) 101 if (!media::RegisterScreenCaptureJni(env))
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 false, // Thread ID 137 false, // Thread ID
142 false, // Timestamp 138 false, // Timestamp
143 false); // Tick count 139 false); // Tick count
144 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 140 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
145 << ", default verbosity = " << logging::GetVlogVerbosity(); 141 << ", default verbosity = " << logging::GetVlogVerbosity();
146 142
147 return true; 143 return true;
148 } 144 }
149 145
150 } // namespace content 146 } // namespace content
OLDNEW
« no previous file with comments | « content/app/DEPS ('k') | content/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698