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_bidirectional_stream.h" |
20 #include "components/cronet/android/cronet_upload_data_stream_adapter.h" | 21 #include "components/cronet/android/cronet_upload_data_stream_adapter.h" |
21 #include "components/cronet/android/cronet_url_request_adapter.h" | 22 #include "components/cronet/android/cronet_url_request_adapter.h" |
22 #include "components/cronet/android/cronet_url_request_context_adapter.h" | 23 #include "components/cronet/android/cronet_url_request_context_adapter.h" |
23 #include "components/cronet/version.h" | 24 #include "components/cronet/version.h" |
24 #include "jni/CronetLibraryLoader_jni.h" | 25 #include "jni/CronetLibraryLoader_jni.h" |
25 #include "net/android/net_jni_registrar.h" | 26 #include "net/android/net_jni_registrar.h" |
26 #include "net/android/network_change_notifier_factory_android.h" | 27 #include "net/android/network_change_notifier_factory_android.h" |
27 #include "net/base/network_change_notifier.h" | 28 #include "net/base/network_change_notifier.h" |
28 #include "url/url_util.h" | 29 #include "url/url_util.h" |
29 | 30 |
30 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 31 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
31 #include "url/android/url_jni_registrar.h" // nogncheck | 32 #include "url/android/url_jni_registrar.h" // nogncheck |
32 #else | 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}, |
| 44 {"CronetBidirectionalStream", CronetBidirectionalStreamRegisterJni}, |
43 {"CronetLibraryLoader", RegisterNativesImpl}, | 45 {"CronetLibraryLoader", RegisterNativesImpl}, |
44 {"CronetUploadDataStreamAdapter", CronetUploadDataStreamAdapterRegisterJni}, | 46 {"CronetUploadDataStreamAdapter", CronetUploadDataStreamAdapterRegisterJni}, |
45 {"CronetUrlRequestAdapter", CronetUrlRequestAdapterRegisterJni}, | 47 {"CronetUrlRequestAdapter", CronetUrlRequestAdapterRegisterJni}, |
46 {"CronetUrlRequestContextAdapter", | 48 {"CronetUrlRequestContextAdapter", |
47 CronetUrlRequestContextAdapterRegisterJni}, | 49 CronetUrlRequestContextAdapterRegisterJni}, |
48 {"NetAndroid", net::android::RegisterJni}, | 50 {"NetAndroid", net::android::RegisterJni}, |
49 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 51 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
50 {"UrlAndroid", url::android::RegisterJni}, | 52 {"UrlAndroid", url::android::RegisterJni}, |
51 #endif | 53 #endif |
52 }; | 54 }; |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 g_network_change_notifier = net::NetworkChangeNotifier::Create(); | 106 g_network_change_notifier = net::NetworkChangeNotifier::Create(); |
105 } | 107 } |
106 | 108 |
107 ScopedJavaLocalRef<jstring> GetCronetVersion( | 109 ScopedJavaLocalRef<jstring> GetCronetVersion( |
108 JNIEnv* env, | 110 JNIEnv* env, |
109 const JavaParamRef<jclass>& jcaller) { | 111 const JavaParamRef<jclass>& jcaller) { |
110 return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION); | 112 return base::android::ConvertUTF8ToJavaString(env, CRONET_VERSION); |
111 } | 113 } |
112 | 114 |
113 } // namespace cronet | 115 } // namespace cronet |
OLD | NEW |