Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include "ui/base/resource/resource_bundle_android.h" | |
| 10 | 11 |
| 11 namespace { | 12 namespace { |
| 12 | 13 |
| 13 bool RegisterJNI(JNIEnv* env) { | 14 bool RegisterJNI(JNIEnv* env) { |
| 14 return true; | 15 return true; |
| 15 } | 16 } |
| 16 | 17 |
| 17 bool Init() { | 18 bool Init() { |
| 18 return true; | 19 return true; |
| 19 } | 20 } |
| 20 | 21 |
| 21 } // namespace | 22 } // namespace |
| 22 | 23 |
| 23 // This is called by the VM when the shared library is first loaded. | 24 // This is called by the VM when the shared library is first loaded. |
| 24 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { | 25 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |
| 25 base::android::InitVM(vm); | 26 base::android::InitVM(vm); |
| 27 ui::SetLocalePaksStoredInApk(true); | |
|
michaelbai
2016/10/11 21:27:44
I still prefer not to do this, because I want to m
agrieve
2016/10/12 02:27:25
Just to be clear - this is *not* the existing beha
Torne
2016/10/12 10:35:55
Oh, so monochrome is currently extracting the loca
michaelbai
2016/10/12 16:39:49
I understood you want both WebView and Chrome in m
| |
| 26 JNIEnv* env = base::android::AttachCurrentThread(); | 28 JNIEnv* env = base::android::AttachCurrentThread(); |
| 27 bool ret; | 29 bool ret; |
| 28 int library_process_type = base::android::GetLibraryProcessType(env); | 30 int library_process_type = base::android::GetLibraryProcessType(env); |
| 29 if (library_process_type == base::android::PROCESS_WEBVIEW || | 31 if (library_process_type == base::android::PROCESS_WEBVIEW || |
| 30 library_process_type == base::android::PROCESS_WEBVIEW_CHILD) { | 32 library_process_type == base::android::PROCESS_WEBVIEW_CHILD) { |
| 31 base::android::DisableManualJniRegistration(); | 33 base::android::DisableManualJniRegistration(); |
| 32 ret = android_webview::OnJNIOnLoadInit(); | 34 ret = android_webview::OnJNIOnLoadInit(); |
| 33 } else { | 35 } else { |
| 34 ret = android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI)) && | 36 ret = android::OnJNIOnLoadRegisterJNI(vm, base::Bind(&RegisterJNI)) && |
| 35 android::OnJNIOnLoadInit(base::Bind(&Init)); | 37 android::OnJNIOnLoadInit(base::Bind(&Init)); |
| 36 } | 38 } |
| 37 return ret ? JNI_VERSION_1_4 : -1; | 39 return ret ? JNI_VERSION_1_4 : -1; |
| 38 } | 40 } |
| OLD | NEW |