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

Unified Diff: mandoline/services/core_services/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
Index: mandoline/services/core_services/android_hooks.cc
diff --git a/mandoline/services/core_services/android_hooks.cc b/mandoline/services/core_services/android_hooks.cc
index e8224023bca84f0710c4e5c2889df288ab0d8857..febd1b58fe905c5d870f1dc6588365c9191468f6 100644
--- a/mandoline/services/core_services/android_hooks.cc
+++ b/mandoline/services/core_services/android_hooks.cc
@@ -8,6 +8,7 @@
#include "base/android/jni_android.h"
#include "base/android/library_loader/library_loader_hooks.h"
#include "base/bind.h"
+#include "components/resource_provider/jni/Main_jni.h"
#include "net/android/net_jni_registrar.h"
namespace {
@@ -25,6 +26,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(&resource_provider::RegisterNativesImpl));
std::vector<base::android::InitCallback> init_callbacks;
init_callbacks.push_back(base::Bind(&Init));
@@ -45,4 +48,6 @@ extern "C" JNI_EXPORT void InitApplicationContext(
const base::android::JavaRef<jobject>& context) {
JNIEnv* env = base::android::AttachCurrentThread();
base::android::InitApplicationContext(env, context);
+ resource_provider::Java_Main_init(
+ env, base::android::GetApplicationContext());
}
« no previous file with comments | « mandoline/services/core_services/DEPS ('k') | mandoline/services/core_services/core_services_application_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698