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 "net/android/net_jni_registrar.h" | 5 #include "net/android/net_jni_registrar.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_registrar.h" | 8 #include "base/android/jni_registrar.h" |
| 9 #include "base/macros.h" |
9 #include "net/android/android_private_key.h" | 10 #include "net/android/android_private_key.h" |
| 11 #include "net/android/cert_verify_result_android.h" |
10 #include "net/android/gurl_utils.h" | 12 #include "net/android/gurl_utils.h" |
| 13 #include "net/android/http_auth_negotiate_android.h" |
11 #include "net/android/keystore.h" | 14 #include "net/android/keystore.h" |
12 #include "net/android/network_change_notifier_android.h" | 15 #include "net/android/network_change_notifier_android.h" |
13 #include "net/android/network_library.h" | 16 #include "net/android/network_library.h" |
14 #include "net/cert/x509_util_android.h" | 17 #include "net/cert/x509_util_android.h" |
15 #include "net/proxy/proxy_config_service_android.h" | 18 #include "net/proxy/proxy_config_service_android.h" |
16 | 19 |
17 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 20 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
18 #include "net/base/net_string_util_icu_alternatives_android.h" | 21 #include "net/base/net_string_util_icu_alternatives_android.h" |
19 #endif | 22 #endif |
20 | 23 |
21 namespace net { | 24 namespace net { |
22 namespace android { | 25 namespace android { |
23 | 26 |
24 static base::android::RegistrationMethod kNetRegisteredMethods[] = { | 27 static base::android::RegistrationMethod kNetRegisteredMethods[] = { |
25 {"AndroidCertVerifyResult", RegisterCertVerifyResult}, | 28 {"AndroidCertVerifyResult", RegisterCertVerifyResult}, |
26 {"AndroidPrivateKey", RegisterAndroidPrivateKey}, | 29 {"AndroidPrivateKey", RegisterAndroidPrivateKey}, |
27 {"AndroidKeyStore", RegisterKeyStore}, | 30 {"AndroidKeyStore", RegisterKeyStore}, |
28 {"AndroidNetworkLibrary", RegisterNetworkLibrary}, | 31 {"AndroidNetworkLibrary", RegisterNetworkLibrary}, |
29 {"GURLUtils", RegisterGURLUtils}, | 32 {"GURLUtils", RegisterGURLUtils}, |
| 33 {"HttpAuthNegotiateAndroid", HttpAuthNegotiateAndroid::Register}, |
30 {"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register}, | 34 {"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register}, |
31 {"ProxyConfigService", ProxyConfigServiceAndroid::Register}, | 35 {"ProxyConfigService", ProxyConfigServiceAndroid::Register}, |
32 {"X509Util", RegisterX509Util}, | 36 {"X509Util", RegisterX509Util}, |
33 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 37 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |
34 {"NetStringUtils", RegisterNetStringUtils} | 38 {"NetStringUtils", RegisterNetStringUtils} |
35 #endif | 39 #endif |
36 }; | 40 }; |
37 | 41 |
38 bool RegisterJni(JNIEnv* env) { | 42 bool RegisterJni(JNIEnv* env) { |
39 return base::android::RegisterNativeMethods( | 43 return base::android::RegisterNativeMethods( |
40 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); | 44 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); |
41 } | 45 } |
42 | 46 |
43 } // namespace android | 47 } // namespace android |
44 } // namespace net | 48 } // namespace net |
OLD | NEW |