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

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

Issue 2646093002: Move //content/browser/device_sensor/ into device/sensors (Closed)
Patch Set: gn format & code rebase Created 3 years, 10 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/BUILD.gn » ('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"
(...skipping 12 matching lines...) Expand all
23 #include "content/app/android/app_jni_registrar.h" 23 #include "content/app/android/app_jni_registrar.h"
24 #include "content/browser/android/browser_jni_registrar.h" 24 #include "content/browser/android/browser_jni_registrar.h"
25 #include "content/common/android/common_jni_registrar.h" 25 #include "content/common/android/common_jni_registrar.h"
26 #include "content/common/content_constants_internal.h" 26 #include "content/common/content_constants_internal.h"
27 #include "content/public/common/content_switches.h" 27 #include "content/public/common/content_switches.h"
28 #include "content/public/common/result_codes.h" 28 #include "content/public/common/result_codes.h"
29 #include "device/bluetooth/android/bluetooth_jni_registrar.h" 29 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
30 #include "device/gamepad/android/gamepad_jni_registrar.h" 30 #include "device/gamepad/android/gamepad_jni_registrar.h"
31 #include "device/generic_sensor/android/sensors_jni_registrar.h" 31 #include "device/generic_sensor/android/sensors_jni_registrar.h"
32 #include "device/geolocation/android/geolocation_jni_registrar.h" 32 #include "device/geolocation/android/geolocation_jni_registrar.h"
33 #include "device/sensors/android/device_sensor_jni_registrar.h"
33 #include "device/time_zone_monitor/android/time_zone_monitor_jni_registrar.h" 34 #include "device/time_zone_monitor/android/time_zone_monitor_jni_registrar.h"
34 #include "device/usb/android/usb_jni_registrar.h" 35 #include "device/usb/android/usb_jni_registrar.h"
35 #include "media/base/android/media_jni_registrar.h" 36 #include "media/base/android/media_jni_registrar.h"
36 #include "media/capture/content/android/screen_capture_jni_registrar.h" 37 #include "media/capture/content/android/screen_capture_jni_registrar.h"
37 #include "media/capture/video/android/capture_jni_registrar.h" 38 #include "media/capture/video/android/capture_jni_registrar.h"
38 #include "media/midi/midi_jni_registrar.h" 39 #include "media/midi/midi_jni_registrar.h"
39 #include "net/android/net_jni_registrar.h" 40 #include "net/android/net_jni_registrar.h"
40 #include "ui/android/ui_android_jni_registrar.h" 41 #include "ui/android/ui_android_jni_registrar.h"
41 #include "ui/base/android/ui_base_jni_registrar.h" 42 #include "ui/base/android/ui_base_jni_registrar.h"
42 #include "ui/gfx/android/gfx_jni_registrar.h" 43 #include "ui/gfx/android/gfx_jni_registrar.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 if (!content::android::RegisterBrowserJni(env)) 76 if (!content::android::RegisterBrowserJni(env))
76 return false; 77 return false;
77 } 78 }
78 79
79 if (!content::android::RegisterAppJni(env)) 80 if (!content::android::RegisterAppJni(env))
80 return false; 81 return false;
81 82
82 if (!device::android::RegisterBluetoothJni(env)) 83 if (!device::android::RegisterBluetoothJni(env))
83 return false; 84 return false;
84 85
86 if (!device::android::RegisterDeviceSensorJni(env))
87 return false;
88
85 if (!device::android::RegisterGamepadJni(env)) 89 if (!device::android::RegisterGamepadJni(env))
86 return false; 90 return false;
87 91
88 if (!device::android::RegisterGeolocationJni(env)) 92 if (!device::android::RegisterGeolocationJni(env))
89 return false; 93 return false;
90 94
91 if (!device::android::RegisterSensorsJni(env)) 95 if (!device::android::RegisterSensorsJni(env))
92 return false; 96 return false;
93 97
94 if (!device::android::RegisterTimeZoneMonitorJni(env)) 98 if (!device::android::RegisterTimeZoneMonitorJni(env))
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 false, // Thread ID 164 false, // Thread ID
161 false, // Timestamp 165 false, // Timestamp
162 false); // Tick count 166 false); // Tick count
163 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 167 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
164 << ", default verbosity = " << logging::GetVlogVerbosity(); 168 << ", default verbosity = " << logging::GetVlogVerbosity();
165 169
166 return true; 170 return true;
167 } 171 }
168 172
169 } // namespace content 173 } // namespace content
OLDNEW
« no previous file with comments | « content/app/DEPS ('k') | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698