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

Side by Side Diff: chrome/browser/android/monochrome_entry_point.cc

Issue 2620303004: Remove JNI onload callback vector construction in favour of direct calls. (Closed)
Patch Set: Created 3 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
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 "android_webview/lib/main/webview_jni_onload.h" 5 #include "android_webview/lib/main/webview_jni_onload.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 "base/android/library_loader/library_loader_hooks.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "chrome/app/android/chrome_jni_onload.h" 9 #include "chrome/app/android/chrome_jni_onload.h"
10 10
11 namespace { 11 namespace {
12 12
13 bool Init() {
14 return true;
15 }
16
17 bool NativeInit() { 13 bool NativeInit() {
18 JNIEnv* env = base::android::AttachCurrentThread(); 14 JNIEnv* env = base::android::AttachCurrentThread();
19 int library_process_type = base::android::GetLibraryProcessType(env); 15 int library_process_type = base::android::GetLibraryProcessType(env);
20 switch (library_process_type) { 16 switch (library_process_type) {
21 case base::android::PROCESS_WEBVIEW: 17 case base::android::PROCESS_WEBVIEW:
22 case base::android::PROCESS_WEBVIEW_CHILD: 18 case base::android::PROCESS_WEBVIEW_CHILD:
23 return android_webview::OnJNIOnLoadInit(); 19 return android_webview::OnJNIOnLoadInit();
24 break; 20 break;
25 case base::android::PROCESS_BROWSER: 21 case base::android::PROCESS_BROWSER:
26 case base::android::PROCESS_CHILD: 22 case base::android::PROCESS_CHILD:
27 return android::OnJNIOnLoadInit(base::Bind(&Init)); 23 return android::OnJNIOnLoadInit();
28 break; 24 break;
29 default: 25 default:
30 NOTREACHED(); 26 NOTREACHED();
31 return false; 27 return false;
32 } 28 }
33 } 29 }
34 30
35 } // namespace 31 } // namespace
36 32
37 // This is called by the VM when the shared library is first loaded. 33 // This is called by the VM when the shared library is first loaded.
38 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 34 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
39 base::android::DisableManualJniRegistration(); 35 base::android::DisableManualJniRegistration();
40 base::android::InitVM(vm); 36 base::android::InitVM(vm);
41 base::android::SetNativeInitializationHook(NativeInit); 37 base::android::SetNativeInitializationHook(NativeInit);
42 return JNI_VERSION_1_4; 38 return JNI_VERSION_1_4;
43 } 39 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698