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

Unified Diff: android_webview/lib/main/webview_jni_onload_delegate.cc

Issue 935413004: Separate OnJNIOnLoad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | base/android/base_jni_onload.h » ('j') | base/android/base_jni_onload.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/lib/main/webview_jni_onload_delegate.cc
diff --git a/android_webview/lib/main/webview_jni_onload_delegate.cc b/android_webview/lib/main/webview_jni_onload_delegate.cc
index 5b1d1c7b7f204f74a2d9ae9969b8016d42e23176..cdd7a682948a6a76ff20291e0810ebad9db87a3e 100644
--- a/android_webview/lib/main/webview_jni_onload_delegate.cc
+++ b/android_webview/lib/main/webview_jni_onload_delegate.cc
@@ -57,7 +57,8 @@ bool WebViewJNIOnLoadDelegate::Init() {
bool OnJNIOnLoad(JavaVM* vm) {
WebViewJNIOnLoadDelegate delegate;
- return content::android::OnJNIOnLoad(vm, &delegate);
+ return content::android::OnJNIOnLoadRegisterJNI(vm, &delegate) &&
+ content::android::OnJNIOnLoadInit(&delegate);
}
} // android_webview
« no previous file with comments | « no previous file | base/android/base_jni_onload.h » ('j') | base/android/base_jni_onload.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698