components/resource_provider/android/android_hooks.cc - Issue 1137223002: core_services: Move resource_provider to core_services.

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: components/resource_provider/android/android_hooks.cc

Issue 1137223002: core_services: Move resource_provider to core_services. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove data_dep per discussion with sky Created 5 years, 7 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 | « components/resource_provider/BUILD.gn ('k') | components/resource_provider/android/java/org/chromium/resource_provider/Main.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/resource_provider/android/android_hooks.cc

diff --git a/components/resource_provider/android/android_hooks.cc b/components/resource_provider/android/android_hooks.cc

index 4ac0460790adda7bd6e10e86a0262138b528bb9b..f51a495e071d0506c6890fbfcb275fb07ec162ab 100644

--- a/components/resource_provider/android/android_hooks.cc

+++ b/components/resource_provider/android/android_hooks.cc

@@ -24,7 +24,8 @@ bool Init() {

JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {

std::vector<base::android::RegisterCallback> register_callbacks;

register_callbacks.push_back(base::Bind(&RegisterJNI));

- register_callbacks.push_back(base::Bind(&RegisterNativesImpl));

+ register_callbacks.push_back(

+ base::Bind(&resource_provider::RegisterNativesImpl));

std::vector<base::android::InitCallback> init_callbacks;

init_callbacks.push_back(base::Bind(&Init));

@@ -45,5 +46,6 @@ extern "C" JNI_EXPORT void InitApplicationContext(

const base::android::JavaRef<jobject>& context) {

JNIEnv* env = base::android::AttachCurrentThread();

base::android::InitApplicationContext(env, context);

- Java_Main_init(env, base::android::GetApplicationContext());

+ resource_provider::Java_Main_init(

+ env, base::android::GetApplicationContext());

}