android_webview/lib/main/webview_jni_onload_delegate.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_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 unified diff | Download patch

« no previous file with comments | « no previous file | base/android/base_jni_onload.h » ('j') | base/android/base_jni_onload.h » ('J')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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_delegate.h"

6	6

7 #include "android_webview/lib/main/aw_main_delegate.h"	7 #include "android_webview/lib/main/aw_main_delegate.h"

8 #include "android_webview/native/android_webview_jni_registrar.h"	8 #include "android_webview/native/android_webview_jni_registrar.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 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50	50

51 // Initialize url lib here while we are still single-threaded, in case we use	51 // Initialize url lib here while we are still single-threaded, in case we use

52 // CookieManager before initializing Chromium (which would normally have done	52 // CookieManager before initializing Chromium (which would normally have done

53 // this). It's safe to call this multiple times.	53 // this). It's safe to call this multiple times.

54 url::Initialize();	54 url::Initialize();

55 return true;	55 return true;

56 }	56 }

57	57

58 bool OnJNIOnLoad(JavaVM* vm) {	58 bool OnJNIOnLoad(JavaVM* vm) {

59 WebViewJNIOnLoadDelegate delegate;	59 WebViewJNIOnLoadDelegate delegate;

60 return content::android::OnJNIOnLoad(vm, &delegate);	60 return content::android::OnJNIOnLoadRegisterJNI(vm, &delegate) &&

	61 content::android::OnJNIOnLoadInit(&delegate);

61 }	62 }

62	63

63 } // android_webview	64 } // android_webview

OLD	NEW