android_webview/lib/main/webview_entry_point.cc - Issue 935413004: Separate OnJNIOnLoad

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: android_webview/lib/main/webview_entry_point.cc

Issue 935413004: Separate OnJNIOnLoad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix chromecast 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:

OLD	NEW
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 "android_webview/lib/main/webview_jni_onload_delegate.h"	5 #include "android_webview/lib/main/webview_jni_onload.h"

6 #include "base/android/jni_android.h"	6 #include "base/android/jni_android.h"

	7 #include "base/bind.h"

7 #include "content/public/app/content_jni_onload.h"	8 #include "content/public/app/content_jni_onload.h"

8	9

9 // This is called by the VM when the shared library is first loaded.	10 // This is called by the VM when the shared library is first loaded.

10 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here.	11 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here.

11 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {	12 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {

12 if (!android_webview::OnJNIOnLoad(vm))	13 if (!content::android::OnJNIOnLoadRegisterJNI(

	14 vm, base::Bind(&android_webview::RegisterJNI)) \|\|

	15 !content::android::OnJNIOnLoadInit(base::Bind(&android_webview::Init)))

13 return -1;	16 return -1;

14	17

15 return JNI_VERSION_1_4;	18 return JNI_VERSION_1_4;

16 }	19 }

OLD	NEW