| 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 "components/view_manager/native_viewport/platform_viewport_android.h" | |
| 11 #include "mojo/runner/android/android_handler.h" | 10 #include "mojo/runner/android/android_handler.h" |
| 12 #include "mojo/runner/android/main.h" | 11 #include "mojo/runner/android/main.h" |
| 12 #include "ui/platform_window/android/platform_window_android.h" |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 base::android::RegistrationMethod kMojoRegisteredMethods[] = { | 16 base::android::RegistrationMethod kMojoRegisteredMethods[] = { |
| 17 {"AndroidHandler", mojo::runner::RegisterAndroidHandlerJni}, | 17 {"AndroidHandler", mojo::runner::RegisterAndroidHandlerJni}, |
| 18 {"PlatformViewportAndroid", | 18 {"PlatformWindowAndroid", ui::PlatformWindowAndroid::Register}, |
| 19 native_viewport::PlatformViewportAndroid::Register}, | |
| 20 {"ShellMain", mojo::runner::RegisterShellMain}, | 19 {"ShellMain", mojo::runner::RegisterShellMain}, |
| 21 }; | 20 }; |
| 22 | 21 |
| 23 bool RegisterJNI(JNIEnv* env) { | 22 bool RegisterJNI(JNIEnv* env) { |
| 24 if (!base::android::RegisterJni(env)) | 23 if (!base::android::RegisterJni(env)) |
| 25 return false; | 24 return false; |
| 26 | 25 |
| 27 return RegisterNativeMethods(env, kMojoRegisteredMethods, | 26 return RegisterNativeMethods(env, kMojoRegisteredMethods, |
| 28 arraysize(kMojoRegisteredMethods)); | 27 arraysize(kMojoRegisteredMethods)); |
| 29 } | 28 } |
| 30 | 29 |
| 31 } // namespace | 30 } // namespace |
| 32 | 31 |
| 33 // This is called by the VM when the shared library is first loaded. | 32 // This is called by the VM when the shared library is first loaded. |
| 34 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 33 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 35 std::vector<base::android::RegisterCallback> register_callbacks; | 34 std::vector<base::android::RegisterCallback> register_callbacks; |
| 36 register_callbacks.push_back(base::Bind(&RegisterJNI)); | 35 register_callbacks.push_back(base::Bind(&RegisterJNI)); |
| 37 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || | 36 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || |
| 38 !base::android::OnJNIOnLoadInit( | 37 !base::android::OnJNIOnLoadInit( |
| 39 std::vector<base::android::InitCallback>())) { | 38 std::vector<base::android::InitCallback>())) { |
| 40 return -1; | 39 return -1; |
| 41 } | 40 } |
| 42 | 41 |
| 43 return JNI_VERSION_1_4; | 42 return JNI_VERSION_1_4; |
| 44 } | 43 } |
| OLD | NEW |