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

Side by Side Diff: mandoline/services/core_services/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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 20 matching lines...) Expand all
31 31
32 std::vector<base::android::InitCallback> init_callbacks; 32 std::vector<base::android::InitCallback> init_callbacks;
33 init_callbacks.push_back(base::Bind(&Init)); 33 init_callbacks.push_back(base::Bind(&Init));
34 34
35 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 35 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
36 !base::android::OnJNIOnLoadInit(init_callbacks)) { 36 !base::android::OnJNIOnLoadInit(init_callbacks)) {
37 return -1; 37 return -1;
38 } 38 }
39 39
40 // There cannot be two AtExitManagers at the same time. Remove the one from 40 // There cannot be two AtExitManagers at the same time. Remove the one from
41 // LibraryLoader as ApplicationRunnerChromium also uses one. 41 // LibraryLoader as ApplicationRunner also uses one.
42 base::android::LibraryLoaderExitHook(); 42 base::android::LibraryLoaderExitHook();
43 43
44 return JNI_VERSION_1_4; 44 return JNI_VERSION_1_4;
45 } 45 }
46 46
47 extern "C" JNI_EXPORT void InitApplicationContext( 47 extern "C" JNI_EXPORT void InitApplicationContext(
48 const base::android::JavaRef<jobject>& context) { 48 const base::android::JavaRef<jobject>& context) {
49 JNIEnv* env = base::android::AttachCurrentThread(); 49 JNIEnv* env = base::android::AttachCurrentThread();
50 base::android::InitApplicationContext(env, context); 50 base::android::InitApplicationContext(env, context);
51 resource_provider::Java_Main_init( 51 resource_provider::Java_Main_init(
52 env, base::android::GetApplicationContext()); 52 env, base::android::GetApplicationContext());
53 } 53 }
OLDNEW
« no previous file with comments | « mandoline/services/core_services/BUILD.gn ('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