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

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

Issue 2784493003: Consolidate JNI registrations for mojo system. (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:
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 16 matching lines...) Expand all
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" 29 #include "device/generic_sensor/android/sensors_jni_registrar.h"
30 #include "device/geolocation/android/geolocation_jni_registrar.h" 30 #include "device/geolocation/android/geolocation_jni_registrar.h"
31 #include "device/sensors/android/device_sensor_jni_registrar.h" 31 #include "device/sensors/android/device_sensor_jni_registrar.h"
32 #include "device/usb/android/usb_jni_registrar.h" 32 #include "device/usb/android/usb_jni_registrar.h"
33 #include "media/base/android/media_jni_registrar.h" 33 #include "media/base/android/media_jni_registrar.h"
34 #include "media/capture/content/android/screen_capture_jni_registrar.h" 34 #include "media/capture/content/android/screen_capture_jni_registrar.h"
35 #include "media/capture/video/android/capture_jni_registrar.h" 35 #include "media/capture/video/android/capture_jni_registrar.h"
36 #include "media/midi/midi_jni_registrar.h" 36 #include "media/midi/midi_jni_registrar.h"
37 #include "mojo/android/system/mojo_jni_registrar.h"
37 #include "net/android/net_jni_registrar.h" 38 #include "net/android/net_jni_registrar.h"
38 #include "ui/android/ui_android_jni_registrar.h" 39 #include "ui/android/ui_android_jni_registrar.h"
39 #include "ui/base/android/ui_base_jni_registrar.h" 40 #include "ui/base/android/ui_base_jni_registrar.h"
40 #include "ui/gfx/android/gfx_jni_registrar.h" 41 #include "ui/gfx/android/gfx_jni_registrar.h"
41 #include "ui/gl/android/gl_jni_registrar.h" 42 #include "ui/gl/android/gl_jni_registrar.h"
42 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 43 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
43 44
44 namespace content { 45 namespace content {
45 46
46 bool EnsureJniRegistered(JNIEnv* env) { 47 bool EnsureJniRegistered(JNIEnv* env) {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 101
101 if (!media::RegisterCaptureJni(env)) 102 if (!media::RegisterCaptureJni(env))
102 return false; 103 return false;
103 104
104 if (!media::RegisterScreenCaptureJni(env)) 105 if (!media::RegisterScreenCaptureJni(env))
105 return false; 106 return false;
106 107
107 if (!midi::RegisterJni(env)) 108 if (!midi::RegisterJni(env))
108 return false; 109 return false;
109 110
111 if (!mojo::android::RegisterSystemJni(env))
112 return false;
113
110 if (!ui::RegisterUIAndroidJni(env)) 114 if (!ui::RegisterUIAndroidJni(env))
111 return false; 115 return false;
112 116
113 g_jni_init_done = true; 117 g_jni_init_done = true;
114 } 118 }
115 119
116 return true; 120 return true;
117 } 121 }
118 122
119 bool LibraryLoaded(JNIEnv* env, jclass clazz) { 123 bool LibraryLoaded(JNIEnv* env, jclass clazz) {
(...skipping 17 matching lines...) Expand all
137 false, // Thread ID 141 false, // Thread ID
138 false, // Timestamp 142 false, // Timestamp
139 false); // Tick count 143 false); // Tick count
140 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 144 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
141 << ", default verbosity = " << logging::GetVlogVerbosity(); 145 << ", default verbosity = " << logging::GetVlogVerbosity();
142 146
143 return true; 147 return true;
144 } 148 }
145 149
146 } // namespace content 150 } // 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