Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: content/app/android/library_loader_hooks.cc

Issue 16424008: move webkit/glue/fling_* to webkit/child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android 5 Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | content/child/android/child_jni_registrar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 67ed6c1311deffa2263ef05664a6168155a30f12..9af580e273e256b087aeacc356cb4f0b67fbbf07 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;
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | content/child/android/child_jni_registrar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698