| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chrome/app/android/chrome_jni_onload.h" | 5 #include "chrome/browser/android/offline_pages/offline_page_evaluation_jni_onloa
d.h" |
| 6 | 6 |
| 7 #include "base/android/library_loader/library_loader_hooks.h" | 7 #include "base/android/base_jni_onload.h" |
| 8 #include "base/android/base_jni_registrar.h" |
| 8 #include "base/bind.h" | 9 #include "base/bind.h" |
| 9 #include "chrome/app/android/chrome_android_initializer.h" | 10 #include "chrome/browser/android/offline_pages/offline_page_evaluation_bridge.h" |
| 10 #include "chrome/browser/android/chrome_jni_registrar.h" | |
| 11 #include "content/public/app/content_jni_onload.h" | |
| 12 | 11 |
| 13 namespace chrome { | 12 namespace offline_pages { |
| 14 namespace android { | 13 namespace android { |
| 15 | 14 |
| 16 namespace { | 15 namespace { |
| 17 | 16 |
| 18 bool RegisterJNI(JNIEnv* env) { | 17 bool RegisterJNI(JNIEnv* env) { |
| 19 if (base::android::GetLibraryProcessType(env) == | 18 return offline_pages::android::OfflinePageEvaluationBridge::Register(env); |
| 20 base::android::PROCESS_BROWSER) { | |
| 21 return RegisterBrowserJNI(env); | |
| 22 } | |
| 23 return true; | |
| 24 } | 19 } |
| 25 | 20 |
| 26 bool Init() { | 21 bool Init() { |
| 27 return RunChrome(); | 22 return true; |
| 28 } | 23 } |
| 29 | 24 |
| 30 } // namespace | 25 } // namespace |
| 31 | 26 |
| 27 |
| 32 bool OnJNIOnLoadRegisterJNI( | 28 bool OnJNIOnLoadRegisterJNI( |
| 33 JavaVM* vm, | 29 JavaVM* vm, |
| 34 base::android::RegisterCallback callback) { | 30 base::android::RegisterCallback callback) { |
| 35 std::vector<base::android::RegisterCallback> register_callbacks; | 31 std::vector<base::android::RegisterCallback> register_callbacks; |
| 36 register_callbacks.push_back(callback); | 32 register_callbacks.push_back(callback); |
| 37 register_callbacks.push_back(base::Bind(&RegisterJNI)); | 33 register_callbacks.push_back(base::Bind(&RegisterJNI)); |
| 38 return content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks); | 34 return content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks); |
| 39 } | 35 } |
| 40 | 36 |
| 41 bool OnJNIOnLoadInit(base::android::InitCallback callback) { | 37 bool OnJNIOnLoadInit(base::android::InitCallback callback) { |
| 42 std::vector<base::android::InitCallback> init_callbacks; | 38 std::vector<base::android::InitCallback> init_callbacks; |
| 43 init_callbacks.push_back(callback); | 39 init_callbacks.push_back(callback); |
| 44 init_callbacks.push_back(base::Bind(&Init)); | 40 init_callbacks.push_back(base::Bind(&Init)); |
| 45 return content::android::OnJNIOnLoadInit(init_callbacks); | 41 return content::android::OnJNIOnLoadInit(init_callbacks); |
| 46 } | 42 } |
| 47 | 43 |
| 48 } // namespace android | 44 } // namespace android |
| 49 } // namespace chrome | 45 } // namespace offline_pages |
| OLD | NEW |