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_main_delegate.h" | 5 #include "android_webview/lib/main/webview_main_delegate.h" |
| 6 #include "android_webview/native/android_webview_jni_registrar.h" |
6 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
7 #include "content/public/app/android_library_loader_hooks.h" | 8 #include "content/public/app/android_library_loader_hooks.h" |
8 #include "content/public/app/content_main.h" | 9 #include "content/public/app/content_main.h" |
9 | 10 |
10 // This is called by the VM when the shared library is first loaded. | 11 // This is called by the VM when the shared library is first loaded. |
11 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here. | 12 // Most of the initialization is done in LibraryLoadedOnMainThread(), not here. |
12 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 13 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
13 base::android::InitVM(vm); | 14 base::android::InitVM(vm); |
14 JNIEnv* env = base::android::AttachCurrentThread(); | 15 JNIEnv* env = base::android::AttachCurrentThread(); |
15 if (!content::RegisterLibraryLoaderEntryHook(env)) { | 16 if (!content::RegisterLibraryLoaderEntryHook(env)) |
16 return -1; | 17 return -1; |
17 } | 18 |
| 19 if (!android_webview::RegisterJni(env)) |
| 20 return -1; |
18 | 21 |
19 content::SetContentMainDelegate(new android_webview::WebViewMainDelegate()); | 22 content::SetContentMainDelegate(new android_webview::WebViewMainDelegate()); |
20 | 23 |
21 return JNI_VERSION_1_4; | 24 return JNI_VERSION_1_4; |
22 } | 25 } |
OLD | NEW |