| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/android/base_jni_registrar.h" | 5 #include "base/android/base_jni_registrar.h" |
| 6 #include "base/android/jni_android.h" | 6 #include "base/android/jni_android.h" |
| 7 #include "base/android/jni_registrar.h" | 7 #include "base/android/jni_registrar.h" |
| 8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
| 9 #include "components/cronet/android/org_chromium_net_UrlRequest.h" | 9 #include "components/cronet/android/org_chromium_net_UrlRequest.h" |
| 10 #include "components/cronet/android/org_chromium_net_UrlRequestContext.h" | 10 #include "components/cronet/android/org_chromium_net_UrlRequestContext.h" |
| 11 #include "components/cronet/android/wrapped_channel_upload_element_reader.h" | |
| 12 #include "net/android/net_jni_registrar.h" | 11 #include "net/android/net_jni_registrar.h" |
| 13 #include "url/android/url_jni_registrar.h" | 12 #include "url/android/url_jni_registrar.h" |
| 14 | 13 |
| 15 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 14 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
| 16 #include "base/i18n/icu_util.h" | 15 #include "base/i18n/icu_util.h" |
| 17 #endif | 16 #endif |
| 18 | 17 |
| 19 namespace { | 18 namespace { |
| 20 | 19 |
| 21 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { | 20 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { |
| 22 {"BaseAndroid", base::android::RegisterJni}, | 21 {"BaseAndroid", base::android::RegisterJni}, |
| 23 {"NetAndroid", net::android::RegisterJni}, | 22 {"NetAndroid", net::android::RegisterJni}, |
| 24 {"UrlAndroid", url::android::RegisterJni}, | 23 {"UrlAndroid", url::android::RegisterJni}, |
| 25 {"UrlRequest", cronet::UrlRequestRegisterJni}, | 24 {"UrlRequest", cronet::UrlRequestRegisterJni}, |
| 26 {"UrlRequestContext", cronet::UrlRequestContextRegisterJni}, | 25 {"UrlRequestContext", cronet::UrlRequestContextRegisterJni}, |
| 27 {"WrappedChannel", cronet::WrappedChannelRegisterJni}, | |
| 28 }; | 26 }; |
| 29 | 27 |
| 30 base::AtExitManager* g_at_exit_manager = NULL; | 28 base::AtExitManager* g_at_exit_manager = NULL; |
| 31 | 29 |
| 32 } // namespace | 30 } // namespace |
| 33 | 31 |
| 34 // Checks the available version of JNI. Also, caches Java reflection artifacts. | 32 // Checks the available version of JNI. Also, caches Java reflection artifacts. |
| 35 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 33 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 36 JNIEnv* env; | 34 JNIEnv* env; |
| 37 if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { | 35 if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 54 return JNI_VERSION_1_6; | 52 return JNI_VERSION_1_6; |
| 55 } | 53 } |
| 56 | 54 |
| 57 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) { | 55 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) { |
| 58 if (g_at_exit_manager) { | 56 if (g_at_exit_manager) { |
| 59 delete g_at_exit_manager; | 57 delete g_at_exit_manager; |
| 60 g_at_exit_manager = NULL; | 58 g_at_exit_manager = NULL; |
| 61 } | 59 } |
| 62 } | 60 } |
| 63 | 61 |
| OLD | NEW |