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

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

Issue 2820213002: Fix naming in base/android/jni_utils. (Closed)
Patch Set: Created 3 years, 8 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 | « base/android/jni_utils.cc ('k') | no next file » | 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 "base/android/jni_android.h" 5 #include "base/android/jni_android.h"
6 #include "base/android/jni_utils.h" 6 #include "base/android/jni_utils.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 NativeInit() { 13 bool NativeInit() {
14 return android::OnJNIOnLoadInit(); 14 return android::OnJNIOnLoadInit();
15 } 15 }
16 16
17 } // namespace 17 } // namespace
18 18
19 // This is called by the VM when the shared library is first loaded. 19 // This is called by the VM when the shared library is first loaded.
20 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 20 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
21 // By default, all JNI methods are registered. However, since render processes 21 // By default, all JNI methods are registered. However, since render processes
22 // don't need very much Java code, we enable selective JNI registration on the 22 // don't need very much Java code, we enable selective JNI registration on the
23 // Java side and only register a subset of JNI methods. 23 // Java side and only register a subset of JNI methods.
24 base::android::InitVM(vm); 24 base::android::InitVM(vm);
25 JNIEnv* env = base::android::AttachCurrentThread(); 25 JNIEnv* env = base::android::AttachCurrentThread();
26 if (base::android::isSelectiveJniRegistrationEnabled(env)) { 26 if (base::android::IsSelectiveJniRegistrationEnabled(env)) {
27 base::android::SetJniRegistrationType( 27 base::android::SetJniRegistrationType(
28 base::android::SELECTIVE_JNI_REGISTRATION); 28 base::android::SELECTIVE_JNI_REGISTRATION);
29 } 29 }
30 if (!android::OnJNIOnLoadRegisterJNI(env)) { 30 if (!android::OnJNIOnLoadRegisterJNI(env)) {
31 return -1; 31 return -1;
32 } 32 }
33 base::android::SetNativeInitializationHook(NativeInit); 33 base::android::SetNativeInitializationHook(NativeInit);
34 return JNI_VERSION_1_4; 34 return JNI_VERSION_1_4;
35 } 35 }
OLDNEW
« no previous file with comments | « base/android/jni_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698