| 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_registrar.h" | 5 #include "base/android/base_jni_registrar.h" |
| 6 #include "base/android/jni_android.h" | 6 #include "base/android/jni_android.h" |
| 7 #include "base/android/jni_registrar.h" | 7 #include "base/android/jni_registrar.h" |
| 8 #include "base/android/library_loader/library_loader_hooks.h" | 8 #include "base/android/library_loader/library_loader_hooks.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "services/native_viewport/platform_viewport_android.h" | 10 #include "services/native_viewport/platform_viewport_android.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 if (!base::android::RegisterLibraryLoaderEntryHook(env)) | 35 if (!base::android::RegisterLibraryLoaderEntryHook(env)) |
| 36 return -1; | 36 return -1; |
| 37 | 37 |
| 38 if (!base::android::RegisterJni(env)) | 38 if (!base::android::RegisterJni(env)) |
| 39 return -1; | 39 return -1; |
| 40 | 40 |
| 41 if (!RegisterMojoJni(env)) | 41 if (!RegisterMojoJni(env)) |
| 42 return -1; | 42 return -1; |
| 43 | 43 |
| 44 if (!mojo::RegisterAndroidHandlerJni(env)) | |
| 45 return -1; | |
| 46 | |
| 47 return JNI_VERSION_1_4; | 44 return JNI_VERSION_1_4; |
| 48 } | 45 } |
| OLD | NEW |