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

Unified Diff: chrome/browser/android/chrome_entry_point.cc

Issue 2620303004: Remove JNI onload callback vector construction in favour of direct calls. (Closed)
Patch Set: rebase compile errors 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/android/chrome_jni_onload.cc ('k') | chrome/browser/android/monochrome_entry_point.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/chrome_entry_point.cc
diff --git a/chrome/browser/android/chrome_entry_point.cc b/chrome/browser/android/chrome_entry_point.cc
index 4a540518ea52b1de61bebefb9d50edf12251fa6c..fad7aa7ccaaa4917bf50f94b061b6f83d672fc43 100644
--- a/chrome/browser/android/chrome_entry_point.cc
+++ b/chrome/browser/android/chrome_entry_point.cc
@@ -10,16 +10,8 @@
namespace {
-bool RegisterJNI(JNIEnv* env) {
- return true;
-}
-
-bool Init() {
- return true;
-}
-
bool NativeInit() {
- return android::OnJNIOnLoadInit(base::Bind(&Init));
+ return android::OnJNIOnLoadInit();
}
} // namespace
@@ -35,7 +27,7 @@ JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
base::android::SetJniRegistrationType(
base::android::SELECTIVE_JNI_REGISTRATION);
}
- if (!android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI))) {
+ if (!android::OnJNIOnLoadRegisterJNI(env)) {
return -1;
}
base::android::SetNativeInitializationHook(NativeInit);
« no previous file with comments | « chrome/app/android/chrome_jni_onload.cc ('k') | chrome/browser/android/monochrome_entry_point.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698