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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <vector> 5 #include <vector>
6 6
7 #include "base/android/base_jni_onload.h" 7 #include "base/android/base_jni_onload.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/library_loader/library_loader_hooks.h" 9 #include "base/android/library_loader/library_loader_hooks.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "components/resource_provider/jni/Main_jni.h" 11 #include "components/resource_provider/jni/Main_jni.h"
12 12
13 namespace { 13 namespace {
14 bool RegisterJNI(JNIEnv* env) { 14 bool RegisterJNI(JNIEnv* env) {
15 return true; 15 return true;
16 } 16 }
17 17
18 bool Init() { 18 bool Init() {
19 return true; 19 return true;
20 } 20 }
21 } // namespace 21 } // namespace
22 22
23 // This is called by the VM when the shared library is first loaded. 23 // This is called by the VM when the shared library is first loaded.
24 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 24 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
25 std::vector<base::android::RegisterCallback> register_callbacks; 25 std::vector<base::android::RegisterCallback> register_callbacks;
26 register_callbacks.push_back(base::Bind(&RegisterJNI)); 26 register_callbacks.push_back(base::Bind(&RegisterJNI));
27 register_callbacks.push_back(base::Bind(&RegisterNativesImpl)); 27 register_callbacks.push_back(
28 base::Bind(&resource_provider::RegisterNativesImpl));
28 29
29 std::vector<base::android::InitCallback> init_callbacks; 30 std::vector<base::android::InitCallback> init_callbacks;
30 init_callbacks.push_back(base::Bind(&Init)); 31 init_callbacks.push_back(base::Bind(&Init));
31 32
32 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 33 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
33 !base::android::OnJNIOnLoadInit(init_callbacks)) { 34 !base::android::OnJNIOnLoadInit(init_callbacks)) {
34 return -1; 35 return -1;
35 } 36 }
36 37
37 // There cannot be two AtExitManagers at the same time. Remove the one from 38 // There cannot be two AtExitManagers at the same time. Remove the one from
38 // LibraryLoader as ApplicationRunnerChromium also uses one. 39 // LibraryLoader as ApplicationRunnerChromium also uses one.
39 base::android::LibraryLoaderExitHook(); 40 base::android::LibraryLoaderExitHook();
40 41
41 return JNI_VERSION_1_4; 42 return JNI_VERSION_1_4;
42 } 43 }
43 44
44 extern "C" JNI_EXPORT void InitApplicationContext( 45 extern "C" JNI_EXPORT void InitApplicationContext(
45 const base::android::JavaRef<jobject>& context) { 46 const base::android::JavaRef<jobject>& context) {
46 JNIEnv* env = base::android::AttachCurrentThread(); 47 JNIEnv* env = base::android::AttachCurrentThread();
47 base::android::InitApplicationContext(env, context); 48 base::android::InitApplicationContext(env, context);
48 Java_Main_init(env, base::android::GetApplicationContext()); 49 resource_provider::Java_Main_init(
50 env, base::android::GetApplicationContext());
49 } 51 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698