| 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" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 if (!content::RegisterLibraryLoaderEntryHook(env)) { | 25 if (!content::RegisterLibraryLoaderEntryHook(env)) { |
| 26 return -1; | 26 return -1; |
| 27 } | 27 } |
| 28 | 28 |
| 29 // To be called only from the UI thread. If loading the library is done on | 29 // To be called only from the UI thread. If loading the library is done on |
| 30 // a separate thread, this should be moved elsewhere. | 30 // a separate thread, this should be moved elsewhere. |
| 31 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, | 31 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, |
| 32 arraysize(kRegistrationMethods))) | 32 arraysize(kRegistrationMethods))) |
| 33 return -1; | 33 return -1; |
| 34 | 34 |
| 35 content::SetContentMainDelegate(new ShellMainDelegate()); | 35 content::SetContentMainDelegate(new content::ShellMainDelegate()); |
| 36 | 36 |
| 37 return JNI_VERSION_1_4; | 37 return JNI_VERSION_1_4; |
| 38 } | 38 } |
| OLD | NEW |