Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: net/android/net_jni_registrar.cc

Issue 1128043007: Support Kerberos on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more nits from bauerb@ Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/http_android_auth_negotiate.h"
12 #include "net/android/keystore.h" 13 #include "net/android/keystore.h"
13 #include "net/android/network_change_notifier_android.h" 14 #include "net/android/network_change_notifier_android.h"
14 #include "net/android/network_library.h" 15 #include "net/android/network_library.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 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 19 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
19 #include "net/base/net_string_util_icu_alternatives_android.h" 20 #include "net/base/net_string_util_icu_alternatives_android.h"
20 #endif 21 #endif
21 22
22 namespace net { 23 namespace net {
23 namespace android { 24 namespace android {
24 25
25 static base::android::RegistrationMethod kNetRegisteredMethods[] = { 26 static base::android::RegistrationMethod kNetRegisteredMethods[] = {
26 {"AndroidCertVerifyResult", RegisterCertVerifyResult}, 27 {"AndroidCertVerifyResult", RegisterCertVerifyResult},
27 {"AndroidPrivateKey", RegisterAndroidPrivateKey}, 28 {"AndroidPrivateKey", RegisterAndroidPrivateKey},
28 {"AndroidKeyStore", RegisterKeyStore}, 29 {"AndroidKeyStore", RegisterKeyStore},
29 {"AndroidNetworkLibrary", RegisterNetworkLibrary}, 30 {"AndroidNetworkLibrary", RegisterNetworkLibrary},
30 {"GURLUtils", RegisterGURLUtils}, 31 {"GURLUtils", RegisterGURLUtils},
32 {"HttpNegotiateAuthenticator", AndroidAuthNegotiate::Register},
31 {"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register}, 33 {"NetworkChangeNotifierAndroid", NetworkChangeNotifierAndroid::Register},
32 {"ProxyConfigService", ProxyConfigServiceAndroid::Register}, 34 {"ProxyConfigService", ProxyConfigServiceAndroid::Register},
33 {"X509Util", RegisterX509Util}, 35 {"X509Util", RegisterX509Util},
34 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID) 36 #if defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
35 {"NetStringUtils", RegisterNetStringUtils} 37 {"NetStringUtils", RegisterNetStringUtils}
36 #endif 38 #endif
37 }; 39 };
38 40
39 bool RegisterJni(JNIEnv* env) { 41 bool RegisterJni(JNIEnv* env) {
40 return base::android::RegisterNativeMethods( 42 return base::android::RegisterNativeMethods(
41 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); 43 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods));
42 } 44 }
43 45
44 } // namespace android 46 } // namespace android
45 } // namespace net 47 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698