| 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.h" | 5 #include "android_webview/lib/main/webview_jni_onload.h" |
| 6 | 6 |
| 7 #include "android_webview/common/aw_version_info_values.h" | 7 #include "android_webview/common/aw_version_info_values.h" |
| 8 #include "android_webview/lib/main/aw_main_delegate.h" | 8 #include "android_webview/lib/main/aw_main_delegate.h" |
| 9 #include "android_webview/native/android_webview_jni_registrar.h" | 9 #include "android_webview/native/android_webview_jni_registrar.h" |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| 11 #include "base/android/jni_registrar.h" | 11 #include "base/android/jni_registrar.h" |
| 12 #include "base/android/library_loader/library_loader_hooks.h" | 12 #include "base/android/library_loader/library_loader_hooks.h" |
| 13 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "components/external_video_surface/component_jni_registrar.h" | |
| 15 #include "components/web_contents_delegate_android/component_jni_registrar.h" | 14 #include "components/web_contents_delegate_android/component_jni_registrar.h" |
| 16 #include "content/public/app/content_jni_onload.h" | 15 #include "content/public/app/content_jni_onload.h" |
| 17 #include "content/public/app/content_main.h" | 16 #include "content/public/app/content_main.h" |
| 18 #include "url/url_util.h" | 17 #include "url/url_util.h" |
| 19 | 18 |
| 20 namespace android_webview { | 19 namespace android_webview { |
| 21 | 20 |
| 22 namespace { | 21 namespace { |
| 23 | 22 |
| 24 static base::android::RegistrationMethod | 23 static base::android::RegistrationMethod |
| 25 kWebViewDependencyRegisteredMethods[] = { | 24 kWebViewDependencyRegisteredMethods[] = { |
| 26 #if defined(VIDEO_HOLE) | |
| 27 { "ExternalVideoSurfaceContainer", | |
| 28 external_video_surface::RegisterExternalVideoSurfaceJni }, | |
| 29 #endif | |
| 30 { "WebContentsDelegateAndroid", | 25 { "WebContentsDelegateAndroid", |
| 31 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni }, | 26 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni }, |
| 32 }; | 27 }; |
| 33 | 28 |
| 34 bool RegisterJNI(JNIEnv* env) { | 29 bool RegisterJNI(JNIEnv* env) { |
| 35 // Register JNI for components we depend on. | 30 // Register JNI for components we depend on. |
| 36 if (!RegisterNativeMethods( | 31 if (!RegisterNativeMethods( |
| 37 env, | 32 env, |
| 38 kWebViewDependencyRegisteredMethods, | 33 kWebViewDependencyRegisteredMethods, |
| 39 arraysize(kWebViewDependencyRegisteredMethods)) || | 34 arraysize(kWebViewDependencyRegisteredMethods)) || |
| (...skipping 22 matching lines...) Expand all Loading... |
| 62 return content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks); | 57 return content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks); |
| 63 } | 58 } |
| 64 | 59 |
| 65 bool OnJNIOnLoadInit() { | 60 bool OnJNIOnLoadInit() { |
| 66 std::vector<base::android::InitCallback> init_callbacks; | 61 std::vector<base::android::InitCallback> init_callbacks; |
| 67 init_callbacks.push_back(base::Bind(&Init)); | 62 init_callbacks.push_back(base::Bind(&Init)); |
| 68 return content::android::OnJNIOnLoadInit(init_callbacks); | 63 return content::android::OnJNIOnLoadInit(init_callbacks); |
| 69 } | 64 } |
| 70 | 65 |
| 71 } // android_webview | 66 } // android_webview |
| OLD | NEW |