| 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 "components/cronet/android/cronet_library_loader.h" | 5 #include "components/cronet/android/cronet_library_loader.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 9 #include "base/android/base_jni_onload.h" | 9 #include "base/android/base_jni_onload.h" |
| 10 #include "base/android/base_jni_registrar.h" | 10 #include "base/android/base_jni_registrar.h" |
| 11 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" |
| 12 #include "base/android/jni_registrar.h" | 12 #include "base/android/jni_registrar.h" |
| 13 #include "base/android/jni_utils.h" | 13 #include "base/android/jni_utils.h" |
| 14 #include "base/android/library_loader/library_loader_hooks.h" | 14 #include "base/android/library_loader/library_loader_hooks.h" |
| 15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
| 16 #include "base/logging.h" | 16 #include "base/logging.h" |
| 17 #include "base/message_loop/message_loop.h" | 17 #include "base/message_loop/message_loop.h" |
| 18 #include "components/cronet/android/chromium_url_request.h" | 18 #include "components/cronet/android/chromium_url_request.h" |
| 19 #include "components/cronet/android/chromium_url_request_context.h" | 19 #include "components/cronet/android/chromium_url_request_context.h" |
| 20 #include "components/cronet/android/cronet_histogram_manager.h" | 20 #include "components/cronet/android/cronet_histogram_manager.h" |
| 21 #include "components/cronet/android/cronet_upload_data_stream_adapter.h" | 21 #include "components/cronet/android/cronet_upload_data_stream_adapter.h" |
| 22 #include "components/cronet/android/cronet_url_request_adapter.h" | 22 #include "components/cronet/android/cronet_url_request_adapter.h" |
| 23 #include "components/cronet/android/cronet_url_request_context_adapter.h" | 23 #include "components/cronet/android/cronet_url_request_context_adapter.h" |
| 24 #include "components/cronet/version.h" | 24 #include "components/cronet/version.h" |
| 25 #include "jni/CronetLibraryLoader_jni.h" | 25 #include "jni/CronetLibraryLoader_jni.h" |
| 26 #include "net/android/net_jni_registrar.h" | 26 #include "net/android/net_jni_registrar.h" |
| 27 #include "net/android/network_change_notifier_factory_android.h" | 27 #include "net/android/network_change_notifier_factory_android.h" |
| 28 #include "net/base/network_change_notifier.h" | 28 #include "net/base/network_change_notifier.h" |
| 29 #include "url/android/url_jni_registrar.h" | |
| 30 #include "url/url_util.h" | 29 #include "url/url_util.h" |
| 31 | 30 |
| 32 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 31 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
| 32 #include "url/android/url_jni_registrar.h" |
| 33 #else |
| 33 #include "base/i18n/icu_util.h" | 34 #include "base/i18n/icu_util.h" |
| 34 #endif | 35 #endif |
| 35 | 36 |
| 36 namespace cronet { | 37 namespace cronet { |
| 37 namespace { | 38 namespace { |
| 38 | 39 |
| 39 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { | 40 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { |
| 40 {"BaseAndroid", base::android::RegisterJni}, | 41 {"BaseAndroid", base::android::RegisterJni}, |
| 41 {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni}, | 42 {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni}, |
| 42 {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni}, | 43 {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni}, |
| 43 {"CronetHistogramManager", CronetHistogramManagerRegisterJni}, | 44 {"CronetHistogramManager", CronetHistogramManagerRegisterJni}, |
| 44 {"CronetLibraryLoader", RegisterNativesImpl}, | 45 {"CronetLibraryLoader", RegisterNativesImpl}, |
| 45 {"CronetUploadDataStreamAdapter", | 46 {"CronetUploadDataStreamAdapter", CronetUploadDataStreamAdapterRegisterJni}, |
| 46 CronetUploadDataStreamAdapterRegisterJni}, | |
| 47 {"CronetUrlRequestAdapter", CronetUrlRequestAdapterRegisterJni}, | 47 {"CronetUrlRequestAdapter", CronetUrlRequestAdapterRegisterJni}, |
| 48 {"CronetUrlRequestContextAdapter", | 48 {"CronetUrlRequestContextAdapter", |
| 49 CronetUrlRequestContextAdapterRegisterJni}, | 49 CronetUrlRequestContextAdapterRegisterJni}, |
| 50 {"NetAndroid", net::android::RegisterJni}, | 50 {"NetAndroid", net::android::RegisterJni}, |
| 51 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
| 51 {"UrlAndroid", url::android::RegisterJni}, | 52 {"UrlAndroid", url::android::RegisterJni}, |
| 53 #endif |
| 52 }; | 54 }; |
| 53 | 55 |
| 54 // MessageLoop on the main thread, which is where objects that receive Java | 56 // MessageLoop on the main thread, which is where objects that receive Java |
| 55 // notifications generally live. | 57 // notifications generally live. |
| 56 base::MessageLoop* g_main_message_loop = nullptr; | 58 base::MessageLoop* g_main_message_loop = nullptr; |
| 57 | 59 |
| 58 net::NetworkChangeNotifier* g_network_change_notifier = nullptr; | 60 net::NetworkChangeNotifier* g_network_change_notifier = nullptr; |
| 59 | 61 |
| 60 bool RegisterJNI(JNIEnv* env) { | 62 bool RegisterJNI(JNIEnv* env) { |
| 61 return base::android::RegisterNativeMethods( | 63 return base::android::RegisterNativeMethods( |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 g_network_change_notifier = net::NetworkChangeNotifier::Create(); | 113 g_network_change_notifier = net::NetworkChangeNotifier::Create(); |
| 112 } | 114 } |
| 113 | 115 |
| 114 ScopedJavaLocalRef<jstring> GetCronetVersion( | 116 ScopedJavaLocalRef<jstring> GetCronetVersion( |
| 115 JNIEnv* env, | 117 JNIEnv* env, |
| 116 const JavaParamRef<jclass>& jcaller) { | 118 const JavaParamRef<jclass>& jcaller) { |
| 117 return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION); | 119 return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION); |
| 118 } | 120 } |
| 119 | 121 |
| 120 } // namespace cronet | 122 } // namespace cronet |
| OLD | NEW |