| 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/gurl_utils.h" | 9 #include "net/android/gurl_utils.h" |
| 10 #include "net/android/http_auth_negotiate_android.h" | 10 #include "net/android/http_auth_negotiate_android.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/cert/x509_util_android.h" | 13 #include "net/cert/x509_util_android.h" |
| 14 #include "net/proxy/proxy_config_service_android.h" | 14 #include "net/proxy/proxy_config_service_android.h" |
| 15 #include "url/url_features.h" | 15 #include "url/url_features.h" |
| 16 | 16 |
| 17 #if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES) | |
| 18 #include "net/base/net_string_util_icu_alternatives_android.h" // nogncheck | |
| 19 #endif | |
| 20 | |
| 21 namespace net { | 17 namespace net { |
| 22 namespace android { | 18 namespace android { |
| 23 | 19 |
| 24 static base::android::RegistrationMethod kNetRegisteredMethods[] = { | 20 static base::android::RegistrationMethod kNetRegisteredMethods[] = { |
| 25 {"GURLUtils", RegisterGURLUtils}, | 21 {"GURLUtils", RegisterGURLUtils}, |
| 26 {"HttpAuthNegotiateAndroid", HttpAuthNegotiateAndroid::Register}, | 22 {"HttpAuthNegotiateAndroid", HttpAuthNegotiateAndroid::Register}, |
| 27 {"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register}, | 23 {"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register}, |
| 28 {"ProxyConfigService", ProxyConfigServiceAndroid::Register}, | 24 {"ProxyConfigService", ProxyConfigServiceAndroid::Register}, |
| 29 {"X509Util", RegisterX509Util}, | 25 {"X509Util", RegisterX509Util}, |
| 30 #if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES) | |
| 31 {"NetStringUtils", RegisterNetStringUtils} | |
| 32 #endif | |
| 33 }; | 26 }; |
| 34 | 27 |
| 35 bool RegisterJni(JNIEnv* env) { | 28 bool RegisterJni(JNIEnv* env) { |
| 36 return base::android::RegisterNativeMethods( | 29 return base::android::RegisterNativeMethods( |
| 37 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); | 30 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); |
| 38 } | 31 } |
| 39 | 32 |
| 40 } // namespace android | 33 } // namespace android |
| 41 } // namespace net | 34 } // namespace net |
| OLD | NEW |