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

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

Issue 46303005: Fix chrome upload with content uri (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify the change using FILE enum instead of adding a new enum Created 7 years, 1 month 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
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/content_uri_utils.h"
10 #include "net/android/gurl_utils.h" 11 #include "net/android/gurl_utils.h"
11 #include "net/android/keystore.h" 12 #include "net/android/keystore.h"
12 #include "net/android/network_change_notifier_android.h" 13 #include "net/android/network_change_notifier_android.h"
13 #include "net/android/network_library.h" 14 #include "net/android/network_library.h"
14 #include "net/cert/x509_util_android.h" 15 #include "net/cert/x509_util_android.h"
15 #include "net/proxy/proxy_config_service_android.h" 16 #include "net/proxy/proxy_config_service_android.h"
16 17
17 namespace net { 18 namespace net {
18 namespace android { 19 namespace android {
19 20
20 static base::android::RegistrationMethod kNetRegisteredMethods[] = { 21 static base::android::RegistrationMethod kNetRegisteredMethods[] = {
21 { "AndroidKeyStore", net::android::RegisterKeyStore }, 22 { "AndroidKeyStore", net::android::RegisterKeyStore },
22 { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary }, 23 { "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary },
24 { "ContentUriUtils", net::RegisterContentUriUtils },
23 { "GURLUtils", net::RegisterGURLUtils }, 25 { "GURLUtils", net::RegisterGURLUtils },
24 { "NetworkChangeNotifierAndroid", 26 { "NetworkChangeNotifierAndroid",
25 net::NetworkChangeNotifierAndroid::Register }, 27 net::NetworkChangeNotifierAndroid::Register },
26 { "ProxyConfigService", net::ProxyConfigServiceAndroid::Register }, 28 { "ProxyConfigService", net::ProxyConfigServiceAndroid::Register },
27 { "X509Util", net::RegisterX509Util }, 29 { "X509Util", net::RegisterX509Util },
28 }; 30 };
29 31
30 bool RegisterJni(JNIEnv* env) { 32 bool RegisterJni(JNIEnv* env) {
31 return base::android::RegisterNativeMethods( 33 return base::android::RegisterNativeMethods(
32 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); 34 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods));
33 } 35 }
34 36
35 } // namespace android 37 } // namespace android
36 } // namespace net 38 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698