| 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/content_main_runner.h" | 10 #include "content/public/app/content_main_runner.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 | 31 |
| 32 // TODO(tedchoc): Set this to the main delegate once the Android specific | 32 // TODO(tedchoc): Set this to the main delegate once the Android specific |
| 33 // browser process initialization gets checked in. | 33 // browser process initialization gets checked in. |
| 34 ShellMainDelegate* delegate = new ShellMainDelegate(); | 34 ShellMainDelegate* delegate = new ShellMainDelegate(); |
| 35 | 35 |
| 36 // TODO(jrg): find command line info from java; pass down in here. | 36 // TODO(jrg): find command line info from java; pass down in here. |
| 37 g_content_main_runner->Initialize(0, NULL, delegate); | 37 g_content_main_runner->Initialize(0, NULL, delegate); |
| 38 | 38 |
| 39 base::android::InitVM(vm); | 39 base::android::InitVM(vm); |
| 40 JNIEnv* env = base::android::AttachCurrentThread(); | 40 JNIEnv* env = base::android::AttachCurrentThread(); |
| 41 if (!RegisterLibraryLoaderEntryHook(env)) { | 41 if (!content::RegisterLibraryLoaderEntryHook(env)) { |
| 42 return -1; | 42 return -1; |
| 43 } | 43 } |
| 44 | 44 |
| 45 // To be called only from the UI thread. If loading the library is done on | 45 // To be called only from the UI thread. If loading the library is done on |
| 46 // a separate thread, this should be moved elsewhere. | 46 // a separate thread, this should be moved elsewhere. |
| 47 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, | 47 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, |
| 48 arraysize(kRegistrationMethods))) | 48 arraysize(kRegistrationMethods))) |
| 49 return -1; | 49 return -1; |
| 50 | 50 |
| 51 return JNI_VERSION_1_4; | 51 return JNI_VERSION_1_4; |
| 52 } | 52 } |
| 53 | 53 |
| 54 | 54 |
| 55 JNI_EXPORT void JNI_OnUnload(JavaVM* vm, void* reserved) { | 55 JNI_EXPORT void JNI_OnUnload(JavaVM* vm, void* reserved) { |
| 56 delete g_content_main_runner; | 56 delete g_content_main_runner; |
| 57 g_content_main_runner = NULL; | 57 g_content_main_runner = NULL; |
| 58 } | 58 } |
| 59 | 59 |
| OLD | NEW |