| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/android/base_jni_onload.h" | 5 #include "base/android/base_jni_onload.h" |
| 6 #include "base/android/base_jni_registrar.h" | 6 #include "base/android/base_jni_registrar.h" |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_registrar.h" | 8 #include "base/android/jni_registrar.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "services/native_viewport/platform_viewport_android.h" | 10 #include "services/native_viewport/platform_viewport_android.h" |
| 11 #include "shell/android/android_handler.h" | 11 #include "shell/android/android_handler.h" |
| 12 #include "shell/android/intent_manager_impl.h" |
| 12 #include "shell/android/keyboard_impl.h" | 13 #include "shell/android/keyboard_impl.h" |
| 13 #include "shell/android/main.h" | 14 #include "shell/android/main.h" |
| 14 | 15 |
| 15 namespace { | 16 namespace { |
| 16 | 17 |
| 17 base::android::RegistrationMethod kMojoRegisteredMethods[] = { | 18 base::android::RegistrationMethod kMojoRegisteredMethods[] = { |
| 18 {"AndroidHandler", mojo::shell::RegisterAndroidHandlerJni}, | 19 {"AndroidHandler", mojo::shell::RegisterAndroidHandlerJni}, |
| 20 {"IntentReceiverRegistry", mojo::shell::RegisterIntentReceiverRegistry}, |
| 19 {"Keyboard", mojo::shell::RegisterKeyboardJni}, | 21 {"Keyboard", mojo::shell::RegisterKeyboardJni}, |
| 20 {"PlatformViewportAndroid", | 22 {"PlatformViewportAndroid", |
| 21 native_viewport::PlatformViewportAndroid::Register}, | 23 native_viewport::PlatformViewportAndroid::Register}, |
| 22 {"ShellMain", mojo::shell::RegisterShellMain}, | 24 {"ShellMain", mojo::shell::RegisterShellMain}, |
| 23 }; | 25 }; |
| 24 | 26 |
| 25 bool RegisterJNI(JNIEnv* env) { | 27 bool RegisterJNI(JNIEnv* env) { |
| 26 if (!base::android::RegisterJni(env)) | 28 if (!base::android::RegisterJni(env)) |
| 27 return false; | 29 return false; |
| 28 | 30 |
| 29 return RegisterNativeMethods(env, kMojoRegisteredMethods, | 31 return RegisterNativeMethods(env, kMojoRegisteredMethods, |
| 30 arraysize(kMojoRegisteredMethods)); | 32 arraysize(kMojoRegisteredMethods)); |
| 31 } | 33 } |
| 32 | 34 |
| 33 } // namespace | 35 } // namespace |
| 34 | 36 |
| 35 // This is called by the VM when the shared library is first loaded. | 37 // This is called by the VM when the shared library is first loaded. |
| 36 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 38 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 37 std::vector<base::android::RegisterCallback> register_callbacks; | 39 std::vector<base::android::RegisterCallback> register_callbacks; |
| 38 register_callbacks.push_back(base::Bind(&RegisterJNI)); | 40 register_callbacks.push_back(base::Bind(&RegisterJNI)); |
| 39 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || | 41 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || |
| 40 !base::android::OnJNIOnLoadInit( | 42 !base::android::OnJNIOnLoadInit( |
| 41 std::vector<base::android::InitCallback>())) { | 43 std::vector<base::android::InitCallback>())) { |
| 42 return -1; | 44 return -1; |
| 43 } | 45 } |
| 44 | 46 |
| 45 return JNI_VERSION_1_4; | 47 return JNI_VERSION_1_4; |
| 46 } | 48 } |
| OLD | NEW |