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

Side by Side Diff: mojo/services/network/android_hooks.cc

Issue 858093002: Update the network service from the Mojo repo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « mojo/services/network/DEPS ('k') | mojo/services/network/network_context.h » ('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 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 "base/android/base_jni_registrar.h" 5 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "base/android/library_loader/library_loader_hooks.h" 7 #include "net/android/net_jni_registrar.h"
8 #include "components/devtools_bridge/android/component_loader.h"
9
10 using namespace devtools_bridge::android;
11 8
12 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 9 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
13 base::android::InitVM(vm); 10 base::android::InitVM(vm);
14 JNIEnv* env = base::android::AttachCurrentThread(); 11 JNIEnv* env = base::android::AttachCurrentThread();
15 if (!base::android::RegisterLibraryLoaderEntryHook(env)) { 12
13 if (!base::android::RegisterJni(env))
16 return -1; 14 return -1;
17 } 15
18 if (!ComponentLoader::OnLoad(env)) { 16 if (!net::android::RegisterJni(env))
19 return -1; 17 return -1;
20 } 18
21 return JNI_VERSION_1_4; 19 return JNI_VERSION_1_4;
22 } 20 }
21
22 extern "C" JNI_EXPORT void InitApplicationContext(
23 const base::android::JavaRef<jobject>& context) {
24 JNIEnv* env = base::android::AttachCurrentThread();
25 base::android::InitApplicationContext(env, context);
26 }
OLDNEW
« no previous file with comments | « mojo/services/network/DEPS ('k') | mojo/services/network/network_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698