diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 20:02:21 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 20:02:21 +0000 |
| commit | b52a42243daf55ec35be02f382e6873aeb9a3992 (patch) | |
| tree | 18f5937da732ff2b91c9d52b25d632c4ebea13b9 /content/app/android/library_loader_hooks.cc | |
| parent | 9559f2c9c5a2760fd3ba291eae6f3fd5c7e921a4 (diff) | |
| download | chromium_src-b52a42243daf55ec35be02f382e6873aeb9a3992.zip chromium_src-b52a42243daf55ec35be02f382e6873aeb9a3992.tar.gz chromium_src-b52a42243daf55ec35be02f382e6873aeb9a3992.tar.bz2 | |
move webkit/glue/fling_* to webkit/child
A little bit of rejiggering for Android JNI registration.
R=jam@chromium.org, jamesr@chromium.org
BUG=237249
Review URL: https://codereview.chromium.org/16424008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app/android/library_loader_hooks.cc')
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 67ed6c1..9af580e 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -18,6 +18,7 @@ #include "base/tracked_objects.h" #include "content/app/android/app_jni_registrar.h" #include "content/browser/android/browser_jni_registrar.h" +#include "content/child/android/child_jni_registrar.h" #include "content/common/android/command_line.h" #include "content/common/android/common_jni_registrar.h" #include "content/public/common/content_switches.h" @@ -86,6 +87,9 @@ static jint LibraryLoaded(JNIEnv* env, jclass clazz, if (!ui::shell_dialogs::RegisterJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; + if (!content::android::RegisterChildJni(env)) + return RESULT_CODE_FAILED_TO_REGISTER_JNI; + if (!content::android::RegisterCommonJni(env)) return RESULT_CODE_FAILED_TO_REGISTER_JNI; |