Chromium Code Reviews| Index: content/app/android/library_loader_hooks.cc |
| diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc |
| index a60155ff67bc92a79b260101ac6835ab5bbf8a1f..c992b48bbff601928f266e305f1afb2d44ab0636 100644 |
| --- a/content/app/android/library_loader_hooks.cc |
| +++ b/content/app/android/library_loader_hooks.cc |
| @@ -22,6 +22,7 @@ |
| #include "content/common/android/common_jni_registrar.h" |
| #include "content/common/android/command_line.h" |
| #include "content/public/common/content_switches.h" |
| +#include "content/public/common/result_codes.h" |
| #include "media/base/android/media_jni_registrar.h" |
| #include "net/android/net_jni_registrar.h" |
| #include "ui/android/ui_jni_registrar.h" |
| @@ -34,7 +35,7 @@ base::AtExitManager* g_at_exit_manager = NULL; |
| namespace content { |
| -static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, |
| +static jint LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, |
| jobjectArray init_command_line) { |
| InitNativeCommandLineFromJavaArray(env, init_command_line); |
| @@ -62,30 +63,30 @@ static jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, |
| << ", default verbosity = " << logging::GetVlogVerbosity(); |
| if (!base::android::RegisterJni(env)) |
| - return JNI_FALSE; |
| + return RESULT_CODE_FAILED_TO_REG_JNI; |
| if (!net::android::RegisterJni(env)) |
| - return JNI_FALSE; |
| + return RESULT_CODE_FAILED_TO_REG_JNI; |
| if (!ui::RegisterJni(env)) |
| - return JNI_FALSE; |
| + return RESULT_CODE_FAILED_TO_REG_JNI; |
| if (!content::android::RegisterCommonJni(env)) |
| - return JNI_FALSE; |
| + return RESULT_CODE_FAILED_TO_REG_JNI; |
| if (!content::android::RegisterBrowserJni(env)) |
| - return JNI_FALSE; |
| + return RESULT_CODE_FAILED_TO_REG_JNI; |
| if (!content::android::RegisterAppJni(env)) |
| - return JNI_FALSE; |
| + return RESULT_CODE_FAILED_TO_REG_JNI; |
| if (!media::RegisterJni(env)) |
| - return JNI_FALSE; |
| + return RESULT_CODE_FAILED_TO_REG_JNI; |
| if (!gfx::RegisterJni(env)) |
| - return JNI_FALSE; |
| + return RESULT_CODE_FAILED_TO_REG_JNI; |
| - return JNI_TRUE; |
| + return 0; |
|
Yaron
2013/01/08 00:54:22
This should probably be RESULT_CODE_NORMAL_EXIT to
michaelbai
2013/01/08 18:06:49
RESULT_CODE_NORMAL_EXIT means the process exit nor
|
| } |
| void LibraryLoaderExitHook() { |