| Index: chrome/browser/android/shortcut_helper.cc
|
| diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
|
| index 1536a9ad36607c177243cc6cb253e8eee2637c17..c4c01f02054670873929582333a63742b11fdb97 100644
|
| --- a/chrome/browser/android/shortcut_helper.cc
|
| +++ b/chrome/browser/android/shortcut_helper.cc
|
| @@ -282,6 +282,13 @@ GURL ShortcutHelper::GetScopeFromURL(const GURL& url) {
|
| return GURL(base::android::ConvertJavaStringToUTF16(env, java_scope_url));
|
| }
|
|
|
| +void ShortcutHelper::ListWebApks(const WebApkInfoCallback& callback) {
|
| + uintptr_t callback_pointer =
|
| + reinterpret_cast<uintptr_t>(new WebApkInfoCallback(callback));
|
| + Java_ShortcutHelper_listWebApks(base::android::AttachCurrentThread(),
|
| + callback_pointer);
|
| +}
|
| +
|
| // Callback used by Java when the shortcut has been created.
|
| // |splash_image_callback| is a pointer to a base::Closure allocated in
|
| // AddShortcutWithSkBitmap, so reinterpret_cast it back and run it.
|
| @@ -299,6 +306,39 @@ void OnWebappDataStored(JNIEnv* env,
|
| delete splash_image_callback;
|
| }
|
|
|
| +void OnWebApksFound(JNIEnv* env,
|
| + const JavaParamRef<jclass>& clazz,
|
| + const jlong jcallback_pointer,
|
| + const JavaParamRef<jobjectArray>& jshort_names,
|
| + const JavaParamRef<jobjectArray>& jpackage_names,
|
| + const JavaParamRef<jintArray>& jshell_apk_versions,
|
| + const JavaParamRef<jintArray>& jversion_codes) {
|
| + DCHECK(jcallback_pointer);
|
| + std::vector<std::string> short_names;
|
| + base::android::AppendJavaStringArrayToStringVector(env, jshort_names,
|
| + &short_names);
|
| + std::vector<std::string> package_names;
|
| + base::android::AppendJavaStringArrayToStringVector(env, jpackage_names,
|
| + &package_names);
|
| + std::vector<int> shell_apk_versions;
|
| + base::android::JavaIntArrayToIntVector(env, jshell_apk_versions,
|
| + &shell_apk_versions);
|
| + std::vector<int> version_codes;
|
| + base::android::JavaIntArrayToIntVector(env, jversion_codes, &version_codes);
|
| +
|
| + std::vector<WebApkInfo> webapks_list;
|
| + for (size_t i = 0; i < short_names.size(); ++i) {
|
| + WebApkInfo webapk_info(short_names[i], package_names[i],
|
| + shell_apk_versions[i], version_codes[i]);
|
| + webapks_list.push_back(webapk_info);
|
| + }
|
| +
|
| + ShortcutHelper::WebApkInfoCallback* webapks_list_callback =
|
| + reinterpret_cast<ShortcutHelper::WebApkInfoCallback*>(jcallback_pointer);
|
| + webapks_list_callback->Run(webapks_list);
|
| + delete webapks_list_callback;
|
| +}
|
| +
|
| bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
| }
|
|
|