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

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

Issue 266053002: Implement alternative string conversion functions in net/ on Android, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove GN changes Created 6 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 | Annotate | Revision Log
« no previous file with comments | « net/android/java/src/org/chromium/net/NetStringUtil.java ('k') | net/base/net_string_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/cert/x509_util_android.h" 15 #include "net/cert/x509_util_android.h"
16 #include "net/proxy/proxy_config_service_android.h" 16 #include "net/proxy/proxy_config_service_android.h"
17 17
18 #if defined(USE_ICU_ALTERNATIVES)
19 #include "net/base/net_string_util_icu_alternatives_android.h"
20 #endif
21
18 namespace net { 22 namespace net {
19 namespace android { 23 namespace android {
20 24
21 static base::android::RegistrationMethod kNetRegisteredMethods[] = { 25 static base::android::RegistrationMethod kNetRegisteredMethods[] = {
22 { "AndroidCertVerifyResult", net::android::RegisterCertVerifyResult }, 26 { "AndroidCertVerifyResult", net::android::RegisterCertVerifyResult },
23 { "AndroidPrivateKey", net::android::RegisterAndroidPrivateKey}, 27 { "AndroidPrivateKey", net::android::RegisterAndroidPrivateKey},
24 { "AndroidKeyStore", net::android::RegisterKeyStore }, 28 { "AndroidKeyStore", net::android::RegisterKeyStore },
25 { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary }, 29 { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary },
26 { "GURLUtils", net::RegisterGURLUtils }, 30 { "GURLUtils", net::RegisterGURLUtils },
27 { "NetworkChangeNotifierAndroid", 31 { "NetworkChangeNotifierAndroid",
28 net::NetworkChangeNotifierAndroid::Register }, 32 net::NetworkChangeNotifierAndroid::Register },
29 { "ProxyConfigService", net::ProxyConfigServiceAndroid::Register }, 33 { "ProxyConfigService", net::ProxyConfigServiceAndroid::Register },
30 { "X509Util", net::RegisterX509Util }, 34 { "X509Util", net::RegisterX509Util },
35 #if defined(USE_ICU_ALTERNATIVES)
36 { "NetStringUtils", net::RegisterNetStringUtils }
37 #endif
31 }; 38 };
32 39
33 bool RegisterJni(JNIEnv* env) { 40 bool RegisterJni(JNIEnv* env) {
34 return base::android::RegisterNativeMethods( 41 return base::android::RegisterNativeMethods(
35 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); 42 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods));
36 } 43 }
37 44
38 } // namespace android 45 } // namespace android
39 } // namespace net 46 } // namespace net
OLDNEW
« no previous file with comments | « net/android/java/src/org/chromium/net/NetStringUtil.java ('k') | net/base/net_string_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698