content/app/android/content_jni_onload.cc - Issue 914083004: Remove android_library_loader_hook from content API

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 914083004: Remove android_library_loader_hook from content API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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:

Index: content/app/android/content_jni_onload.cc

diff --git a/content/app/android/content_jni_onload.cc b/content/app/android/content_jni_onload.cc

index 1349d0ee4ddb91acf4de2e645c72812d69df66f2..ab9596526ebfa1a23f6e4ea15f7d298a5b301889 100644

--- a/content/app/android/content_jni_onload.cc

+++ b/content/app/android/content_jni_onload.cc

@@ -9,7 +9,7 @@

#include "base/android/base_jni_onload.h"

#include "base/android/jni_onload_delegate.h"

#include "base/android/library_loader/library_loader_hooks.h"

-#include "content/public/app/android_library_loader_hooks.h"

+#include "content/app/android/library_loader_hooks.h"

#include "content/public/app/content_main.h"

namespace content {

@@ -25,9 +25,6 @@ class ContentJNIOnLoadDelegate

};

bool ContentJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {

- // TODO(michaelbai): Remove the EnsureJniRegistered from

- // content::LibraryLoaded and move android_library_loader_hooks.h to

- // content/app/android/.

return content::EnsureJniRegistered(env);

}