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

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

Issue 2202033002: ui: Remove unneeded RegisterNatives() call on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@jnireg1
Patch Set: rebase, unused headers Created 4 years, 4 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 | « no previous file | content/public/test/content_test_suite_base.cc » ('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 19 matching lines...) Expand all
30 #include "device/geolocation/android/geolocation_jni_registrar.h" 30 #include "device/geolocation/android/geolocation_jni_registrar.h"
31 #include "device/power_save_blocker/power_save_blocker_jni_registrar.h" 31 #include "device/power_save_blocker/power_save_blocker_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 "net/android/net_jni_registrar.h" 37 #include "net/android/net_jni_registrar.h"
38 #include "ui/android/ui_android_jni_registrar.h" 38 #include "ui/android/ui_android_jni_registrar.h"
39 #include "ui/base/android/ui_base_jni_registrar.h" 39 #include "ui/base/android/ui_base_jni_registrar.h"
40 #include "ui/events/android/events_jni_registrar.h"
41 #include "ui/gfx/android/gfx_jni_registrar.h" 40 #include "ui/gfx/android/gfx_jni_registrar.h"
42 #include "ui/gl/android/gl_jni_registrar.h" 41 #include "ui/gl/android/gl_jni_registrar.h"
43 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h" 42 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
44 43
45 namespace content { 44 namespace content {
46 45
47 bool EnsureJniRegistered(JNIEnv* env) { 46 bool EnsureJniRegistered(JNIEnv* env) {
48 static bool g_jni_init_done = false; 47 static bool g_jni_init_done = false;
49 48
50 if (!g_jni_init_done) { 49 if (!g_jni_init_done) {
51 if (!base::android::RegisterJni(env)) 50 if (!base::android::RegisterJni(env))
52 return false; 51 return false;
53 52
54 if (!gfx::android::RegisterJni(env)) 53 if (!gfx::android::RegisterJni(env))
55 return false; 54 return false;
56 55
57 if (!net::android::RegisterJni(env)) 56 if (!net::android::RegisterJni(env))
58 return false; 57 return false;
59 58
60 if (!ui::android::RegisterJni(env)) 59 if (!ui::android::RegisterJni(env))
61 return false; 60 return false;
62 61
63 if (!ui::gl::android::RegisterJni(env)) 62 if (!ui::gl::android::RegisterJni(env))
64 return false; 63 return false;
65 64
66 if (!ui::events::android::RegisterJni(env))
67 return false;
68
69 if (!ui::shell_dialogs::RegisterJni(env)) 65 if (!ui::shell_dialogs::RegisterJni(env))
70 return false; 66 return false;
71 67
72 if (!content::android::RegisterCommonJni(env)) 68 if (!content::android::RegisterCommonJni(env))
73 return false; 69 return false;
74 70
75 if (!content::android::RegisterBrowserJni(env)) 71 if (!content::android::RegisterBrowserJni(env))
76 return false; 72 return false;
77 73
78 if (!content::android::RegisterAppJni(env)) 74 if (!content::android::RegisterAppJni(env))
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 false, // Thread ID 152 false, // Thread ID
157 false, // Timestamp 153 false, // Timestamp
158 false); // Tick count 154 false); // Tick count
159 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel() 155 VLOG(0) << "Chromium logging enabled: level = " << logging::GetMinLogLevel()
160 << ", default verbosity = " << logging::GetVlogVerbosity(); 156 << ", default verbosity = " << logging::GetVlogVerbosity();
161 157
162 return true; 158 return true;
163 } 159 }
164 160
165 } // namespace content 161 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/test/content_test_suite_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698