| 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" | |
| 8 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 9 #include "base/android/jni_registrar.h" | 8 #include "base/android/jni_registrar.h" |
| 10 #include "net/android/android_private_key.h" | 9 #include "net/android/android_private_key.h" |
| 11 #include "net/android/gurl_utils.h" | 10 #include "net/android/gurl_utils.h" |
| 12 #include "net/android/keystore.h" | 11 #include "net/android/keystore.h" |
| 13 #include "net/android/network_change_notifier_android.h" | 12 #include "net/android/network_change_notifier_android.h" |
| 14 #include "net/android/network_library.h" | 13 #include "net/android/network_library.h" |
| 15 #include "net/cert/x509_util_android.h" | 14 #include "net/cert/x509_util_android.h" |
| 16 #include "net/proxy/proxy_config_service_android.h" | 15 #include "net/proxy/proxy_config_service_android.h" |
| 17 | 16 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 36 #endif | 35 #endif |
| 37 }; | 36 }; |
| 38 | 37 |
| 39 bool RegisterJni(JNIEnv* env) { | 38 bool RegisterJni(JNIEnv* env) { |
| 40 return base::android::RegisterNativeMethods( | 39 return base::android::RegisterNativeMethods( |
| 41 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); | 40 env, kNetRegisteredMethods, arraysize(kNetRegisteredMethods)); |
| 42 } | 41 } |
| 43 | 42 |
| 44 } // namespace android | 43 } // namespace android |
| 45 } // namespace net | 44 } // namespace net |
| OLD | NEW |