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/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
9 #include "base/android/jni_registrar.h" | 9 #include "base/android/jni_registrar.h" |
10 #include "net/android/gurl_utils.h" | 10 #include "net/android/gurl_utils.h" |
11 #include "net/android/keystore.h" | 11 #include "net/android/keystore.h" |
12 #include "net/android/network_change_notifier_android.h" | 12 #include "net/android/network_change_notifier_android.h" |
13 #include "net/android/network_library.h" | 13 #include "net/android/network_library.h" |
| 14 #include "net/android/x509_util.h" |
14 #include "net/proxy/proxy_config_service_android.h" | 15 #include "net/proxy/proxy_config_service_android.h" |
15 | 16 |
16 namespace net { | 17 namespace net { |
17 namespace android { | 18 namespace android { |
18 | 19 |
19 static base::android::RegistrationMethod kNetRegisteredMethods[] = { | 20 static base::android::RegistrationMethod kNetRegisteredMethods[] = { |
20 { "AndroidKeyStore", net::android::RegisterKeyStore }, | 21 { "AndroidKeyStore", net::android::RegisterKeyStore }, |
21 { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary }, | 22 { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary }, |
22 { "GURLUtils", net::RegisterGURLUtils }, | 23 { "GURLUtils", net::RegisterGURLUtils }, |
23 { "NetworkChangeNotifierAndroid", | 24 { "NetworkChangeNotifierAndroid", |
24 net::NetworkChangeNotifierAndroid::Register }, | 25 net::NetworkChangeNotifierAndroid::Register }, |
25 { "ProxyConfigService", net::ProxyConfigServiceAndroid::Register }, | 26 { "ProxyConfigService", net::ProxyConfigServiceAndroid::Register }, |
| 27 { "X509Util", net::RegisterX509Util }, |
26 }; | 28 }; |
27 | 29 |
28 bool RegisterJni(JNIEnv* env) { | 30 bool RegisterJni(JNIEnv* env) { |
29 return base::android::RegisterNativeMethods( | 31 return base::android::RegisterNativeMethods( |
30 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); | 32 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); |
31 } | 33 } |
32 | 34 |
33 } // namespace android | 35 } // namespace android |
34 } // namespace net | 36 } // namespace net |
OLD | NEW |