| 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 "base/android/jni_android.h" | 5 #include "base/android/jni_android.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "chromecast/android/cast_jni_registrar.h" | 7 #include "chromecast/android/cast_jni_registrar.h" |
| 8 #include "chromecast/android/platform_jni_loader.h" | 8 #include "chromecast/android/platform_jni_loader.h" |
| 9 #include "chromecast/app/cast_main_delegate.h" | 9 #include "chromecast/app/cast_main_delegate.h" |
| 10 #include "chromecast/browser/android/jni_registrar.h" |
| 10 #include "content/public/app/content_jni_onload.h" | 11 #include "content/public/app/content_jni_onload.h" |
| 11 #include "content/public/app/content_main.h" | 12 #include "content/public/app/content_main.h" |
| 12 #include "content/public/browser/android/compositor.h" | 13 #include "content/public/browser/android/compositor.h" |
| 13 | 14 |
| 14 namespace { | 15 namespace { |
| 15 | 16 |
| 16 bool RegisterJNI(JNIEnv* env) { | 17 bool RegisterJNI(JNIEnv* env) { |
| 17 // To be called only from the UI thread. If loading the library is done on | 18 // To be called only from the UI thread. If loading the library is done on |
| 18 // a separate thread, this should be moved elsewhere. | 19 // a separate thread, this should be moved elsewhere. |
| 19 if (!chromecast::android::RegisterJni(env)) | 20 if (!chromecast::android::RegisterJni(env)) |
| 20 return false; | 21 return false; |
| 22 if (!chromecast::shell::RegisterJni(env)) |
| 23 return false; |
| 21 // Allow platform-specific implementations to perform more JNI registration. | 24 // Allow platform-specific implementations to perform more JNI registration. |
| 22 if (!chromecast::android::PlatformRegisterJni(env)) | 25 if (!chromecast::android::PlatformRegisterJni(env)) |
| 23 return false; | 26 return false; |
| 24 return true; | 27 return true; |
| 25 } | 28 } |
| 26 | 29 |
| 27 bool Init() { | 30 bool Init() { |
| 28 content::Compositor::Initialize(); | 31 content::Compositor::Initialize(); |
| 29 content::SetContentMainDelegate(new chromecast::shell::CastMainDelegate); | 32 content::SetContentMainDelegate(new chromecast::shell::CastMainDelegate); |
| 30 return true; | 33 return true; |
| 31 } | 34 } |
| 32 | 35 |
| 33 } // namespace | 36 } // namespace |
| 34 | 37 |
| 35 // This is called by the VM when the shared library is first loaded. | 38 // This is called by the VM when the shared library is first loaded. |
| 36 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 39 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 37 std::vector<base::android::RegisterCallback> register_callbacks; | 40 std::vector<base::android::RegisterCallback> register_callbacks; |
| 38 register_callbacks.push_back(base::Bind(&RegisterJNI)); | 41 register_callbacks.push_back(base::Bind(&RegisterJNI)); |
| 39 std::vector<base::android::InitCallback> init_callbacks; | 42 std::vector<base::android::InitCallback> init_callbacks; |
| 40 init_callbacks.push_back(base::Bind(&Init)); | 43 init_callbacks.push_back(base::Bind(&Init)); |
| 41 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || | 44 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || |
| 42 !content::android::OnJNIOnLoadInit(init_callbacks)) { | 45 !content::android::OnJNIOnLoadInit(init_callbacks)) { |
| 43 return -1; | 46 return -1; |
| 44 } | 47 } |
| 45 return JNI_VERSION_1_4; | 48 return JNI_VERSION_1_4; |
| 46 } | 49 } |
| OLD | NEW |