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