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

Side by Side Diff: components/resource_provider/android/android_hooks.cc

Issue 1142323003: Remove duplicate application cpp files in mojo/application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
« no previous file with comments | « components/resource_provider/BUILD.gn ('k') | components/resource_provider/main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 18 matching lines...) Expand all
29 29
30 std::vector<base::android::InitCallback> init_callbacks; 30 std::vector<base::android::InitCallback> init_callbacks;
31 init_callbacks.push_back(base::Bind(&Init)); 31 init_callbacks.push_back(base::Bind(&Init));
32 32
33 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 33 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
34 !base::android::OnJNIOnLoadInit(init_callbacks)) { 34 !base::android::OnJNIOnLoadInit(init_callbacks)) {
35 return -1; 35 return -1;
36 } 36 }
37 37
38 // 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
39 // LibraryLoader as ApplicationRunnerChromium also uses one. 39 // LibraryLoader as ApplicationRunner also uses one.
40 base::android::LibraryLoaderExitHook(); 40 base::android::LibraryLoaderExitHook();
41 41
42 return JNI_VERSION_1_4; 42 return JNI_VERSION_1_4;
43 } 43 }
44 44
45 extern "C" JNI_EXPORT void InitApplicationContext( 45 extern "C" JNI_EXPORT void InitApplicationContext(
46 const base::android::JavaRef<jobject>& context) { 46 const base::android::JavaRef<jobject>& context) {
47 JNIEnv* env = base::android::AttachCurrentThread(); 47 JNIEnv* env = base::android::AttachCurrentThread();
48 base::android::InitApplicationContext(env, context); 48 base::android::InitApplicationContext(env, context);
49 resource_provider::Java_Main_init( 49 resource_provider::Java_Main_init(
50 env, base::android::GetApplicationContext()); 50 env, base::android::GetApplicationContext());
51 } 51 }
OLDNEW
« no previous file with comments | « components/resource_provider/BUILD.gn ('k') | components/resource_provider/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698