| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/debug/debugger.h" | 6 #include "base/debug/debugger.h" |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
| 9 #include "base/android/jni_registrar.h" | 9 #include "base/android/jni_registrar.h" |
| 10 #include "content/public/app/android_library_loader_hooks.h" | 10 #include "content/public/app/android_library_loader_hooks.h" |
| 11 #include "content/public/app/content_main.h" | 11 #include "content/public/app/content_main.h" |
| 12 #include "content/public/browser/android/compositor.h" | 12 #include "content/public/browser/android/compositor.h" |
| 13 #include "content/shell/android/shell_manager.h" | 13 #include "content/shell/android/shell_manager.h" |
| 14 #include "content/shell/android/tracing_shell.h" |
| 14 #include "content/shell/shell.h" | 15 #include "content/shell/shell.h" |
| 15 #include "content/shell/shell_main_delegate.h" | 16 #include "content/shell/shell_main_delegate.h" |
| 16 | 17 |
| 17 static base::android::RegistrationMethod kRegistrationMethods[] = { | 18 static base::android::RegistrationMethod kRegistrationMethods[] = { |
| 18 { "Shell", content::Shell::Register }, | 19 { "Shell", content::Shell::Register }, |
| 19 { "ShellManager", content::RegisterShellManager }, | 20 { "ShellManager", content::RegisterShellManager }, |
| 21 { "TraceController", content::RegisterTracingHandler }, |
| 20 }; | 22 }; |
| 21 | 23 |
| 22 // This is called by the VM when the shared library is first loaded. | 24 // This is called by the VM when the shared library is first loaded. |
| 23 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 25 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 24 base::android::InitVM(vm); | 26 base::android::InitVM(vm); |
| 25 JNIEnv* env = base::android::AttachCurrentThread(); | 27 JNIEnv* env = base::android::AttachCurrentThread(); |
| 26 if (!content::RegisterLibraryLoaderEntryHook(env)) | 28 if (!content::RegisterLibraryLoaderEntryHook(env)) |
| 27 return -1; | 29 return -1; |
| 28 | 30 |
| 29 // To be called only from the UI thread. If loading the library is done on | 31 // To be called only from the UI thread. If loading the library is done on |
| 30 // a separate thread, this should be moved elsewhere. | 32 // a separate thread, this should be moved elsewhere. |
| 31 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, | 33 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, |
| 32 arraysize(kRegistrationMethods))) | 34 arraysize(kRegistrationMethods))) |
| 33 return -1; | 35 return -1; |
| 34 | 36 |
| 35 content::Compositor::Initialize(); | 37 content::Compositor::Initialize(); |
| 36 | 38 |
| 37 content::SetContentMainDelegate(new content::ShellMainDelegate()); | 39 content::SetContentMainDelegate(new content::ShellMainDelegate()); |
| 38 | 40 |
| 39 return JNI_VERSION_1_4; | 41 return JNI_VERSION_1_4; |
| 40 } | 42 } |
| OLD | NEW |