| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/android/base_jni_onload.h" | 7 #include "base/android/base_jni_onload.h" |
| 8 #include "base/android/context_utils.h" |
| 8 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 9 #include "base/android/library_loader/library_loader_hooks.h" | 10 #include "base/android/library_loader/library_loader_hooks.h" |
| 10 #include "base/bind.h" | 11 #include "base/bind.h" |
| 11 #include "net/android/net_jni_registrar.h" | 12 #include "net/android/net_jni_registrar.h" |
| 12 | 13 |
| 13 namespace { | 14 namespace { |
| 14 bool RegisterJNI(JNIEnv* env) { | 15 bool RegisterJNI(JNIEnv* env) { |
| 15 return net::android::RegisterJni(env); | 16 return net::android::RegisterJni(env); |
| 16 } | 17 } |
| 17 | 18 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 39 base::android::LibraryLoaderExitHook(); | 40 base::android::LibraryLoaderExitHook(); |
| 40 | 41 |
| 41 return JNI_VERSION_1_4; | 42 return JNI_VERSION_1_4; |
| 42 } | 43 } |
| 43 | 44 |
| 44 extern "C" JNI_EXPORT void InitApplicationContext( | 45 extern "C" JNI_EXPORT void InitApplicationContext( |
| 45 const base::android::JavaRef<jobject>& context) { | 46 const base::android::JavaRef<jobject>& context) { |
| 46 JNIEnv* env = base::android::AttachCurrentThread(); | 47 JNIEnv* env = base::android::AttachCurrentThread(); |
| 47 base::android::InitApplicationContext(env, context); | 48 base::android::InitApplicationContext(env, context); |
| 48 } | 49 } |
| OLD | NEW |