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