| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "blimp/client/app/android/blimp_library_loader.h" | 5 #include "blimp/client/app/android/blimp_library_loader.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/android/base_jni_onload.h" | 9 #include "base/android/base_jni_onload.h" |
| 10 #include "base/android/base_jni_registrar.h" | 10 #include "base/android/base_jni_registrar.h" |
| 11 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" |
| 12 #include "base/android/library_loader/library_loader_hooks.h" | 12 #include "base/android/library_loader/library_loader_hooks.h" |
| 13 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 15 #include "blimp/client/app/android/blimp_app_jni_registrar.h" | 15 #include "blimp/client/app/android/blimp_app_jni_registrar.h" |
| 16 #include "blimp/client/app/blimp_startup.h" | 16 #include "blimp/client/app/blimp_startup.h" |
| 17 #include "blimp/client/public/android/blimp_jni_registrar.h" | 17 #include "blimp/client/public/android/blimp_jni_registrar.h" |
| 18 #include "jni/BlimpLibraryLoader_jni.h" | 18 #include "jni/BlimpLibraryLoader_jni.h" |
| 19 #include "net/android/net_jni_registrar.h" | 19 #include "net/android/net_jni_registrar.h" |
| 20 #include "ui/gfx/android/gfx_jni_registrar.h" |
| 20 #include "ui/gl/gl_surface.h" | 21 #include "ui/gl/gl_surface.h" |
| 21 | 22 |
| 22 using base::android::JavaParamRef; | 23 using base::android::JavaParamRef; |
| 23 | 24 |
| 24 namespace { | 25 namespace { |
| 25 | 26 |
| 26 bool OnLibrariesLoaded(JNIEnv* env, jclass clazz) { | 27 bool OnLibrariesLoaded(JNIEnv* env, jclass clazz) { |
| 27 blimp::client::InitializeLogging(); | 28 blimp::client::InitializeLogging(); |
| 28 return true; | 29 return true; |
| 29 } | 30 } |
| 30 | 31 |
| 31 bool OnJniInitializationComplete() { | 32 bool OnJniInitializationComplete() { |
| 32 base::android::SetLibraryLoadedHook(&OnLibrariesLoaded); | 33 base::android::SetLibraryLoadedHook(&OnLibrariesLoaded); |
| 33 return true; | 34 return true; |
| 34 } | 35 } |
| 35 | 36 |
| 36 bool RegisterJni(JNIEnv* env) { | 37 bool RegisterJni(JNIEnv* env) { |
| 37 if (!base::android::RegisterJni(env)) | 38 if (!base::android::RegisterJni(env)) |
| 38 return false; | 39 return false; |
| 39 | 40 |
| 40 if (!net::android::RegisterJni(env)) | 41 if (!net::android::RegisterJni(env)) |
| 41 return false; | 42 return false; |
| 42 | 43 |
| 44 if (!gfx::android::RegisterJni(env)) |
| 45 return false; |
| 46 |
| 43 if (!blimp::client::RegisterBlimpJni(env)) | 47 if (!blimp::client::RegisterBlimpJni(env)) |
| 44 return false; | 48 return false; |
| 45 | 49 |
| 46 if (!blimp::client::RegisterBlimpAppJni(env)) | 50 if (!blimp::client::RegisterBlimpAppJni(env)) |
| 47 return false; | 51 return false; |
| 48 | 52 |
| 49 return true; | 53 return true; |
| 50 } | 54 } |
| 51 | 55 |
| 52 } // namespace | 56 } // namespace |
| (...skipping 27 matching lines...) Expand all Loading... |
| 80 // Although we only need to register JNI for base/ and blimp/, this follows | 84 // Although we only need to register JNI for base/ and blimp/, this follows |
| 81 // the general Chrome for Android pattern, to be future-proof against future | 85 // the general Chrome for Android pattern, to be future-proof against future |
| 82 // changes to JNI. | 86 // changes to JNI. |
| 83 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || | 87 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || |
| 84 !base::android::OnJNIOnLoadInit(init_callbacks)) { | 88 !base::android::OnJNIOnLoadInit(init_callbacks)) { |
| 85 return -1; | 89 return -1; |
| 86 } | 90 } |
| 87 | 91 |
| 88 return JNI_VERSION_1_4; | 92 return JNI_VERSION_1_4; |
| 89 } | 93 } |
| OLD | NEW |