diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-02-26 12:48:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-26 20:49:42 +0000 |
| commit | 79ba8f35ef4af9b7f6cb137f5f5f960566b55294 (patch) | |
| tree | 4313832d0f4f22ebbd2e8ebffb69f9f626b4eceb /content/public/app | |
| parent | fb62911afab538f2b647fdecc2ef233f9cf9de9a (diff) | |
| download | chromium_src-79ba8f35ef4af9b7f6cb137f5f5f960566b55294.zip chromium_src-79ba8f35ef4af9b7f6cb137f5f5f960566b55294.tar.gz chromium_src-79ba8f35ef4af9b7f6cb137f5f5f960566b55294.tar.bz2 | |
Make content JNI API accept a list of callbacks
It turned out we still need a list of callbacks to be passed into content,
downstream Android has its own JNI registration and initialization,
chrome_sync_shell does too, they both need to be passed into content along
with chrome's
BUG=447393
Review URL: https://codereview.chromium.org/956073002
Cr-Commit-Position: refs/heads/master@{#318302}
Diffstat (limited to 'content/public/app')
| -rw-r--r-- | content/public/app/content_jni_onload.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/public/app/content_jni_onload.h b/content/public/app/content_jni_onload.h index 2f3ee66..1b220f5 100644 --- a/content/public/app/content_jni_onload.h +++ b/content/public/app/content_jni_onload.h @@ -16,10 +16,11 @@ namespace android { // Returns true if JNI registration succeeded. CONTENT_EXPORT bool OnJNIOnLoadRegisterJNI( JavaVM* vm, - base::android::RegisterCallback callback); + std::vector<base::android::RegisterCallback> callbacks); // Returns true if initialization succeeded. -CONTENT_EXPORT bool OnJNIOnLoadInit(base::android::InitCallback callback); +CONTENT_EXPORT bool OnJNIOnLoadInit( + std::vector<base::android::InitCallback> callbacks); } // namespace android } // namespace content |