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

Unified Diff: chrome/browser/android/webapk/webapk_update_manager.cc

Issue 2528073002: Add a flag in WebAPK's proto when the Web App Manifest is no longer available. (Closed)
Patch Set: Renaming. Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/webapk/webapk_installer_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/webapk/webapk_update_manager.cc
diff --git a/chrome/browser/android/webapk/webapk_update_manager.cc b/chrome/browser/android/webapk/webapk_update_manager.cc
index aef343c4ee0417d9a62048732191ec502792444d..2cf30491a9c1f0deac239915dd43f57b14e63227 100644
--- a/chrome/browser/android/webapk/webapk_update_manager.cc
+++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -53,16 +53,17 @@ static void UpdateAsync(
const JavaParamRef<jstring>& java_name,
const JavaParamRef<jstring>& java_short_name,
const JavaParamRef<jstring>& java_best_icon_url,
- const JavaParamRef<jstring>& java_best_icon_murmur2_hash,
const JavaParamRef<jobject>& java_best_icon_bitmap,
const JavaParamRef<jobjectArray>& java_icon_urls,
+ const JavaParamRef<jobjectArray>& java_icon_hashes,
jint java_display_mode,
jint java_orientation,
jlong java_theme_color,
jlong java_background_color,
const JavaParamRef<jstring>& java_web_manifest_url,
const JavaParamRef<jstring>& java_webapk_package,
- jint java_webapk_version) {
+ jint java_webapk_version,
+ jboolean java_is_manifest_stale) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
Profile* profile = ProfileManager::GetLastUsedProfile();
@@ -91,15 +92,19 @@ static void UpdateAsync(
base::android::AppendJavaStringArrayToStringVector(
env, java_icon_urls.obj(), &info.icon_urls);
+ std::vector<std::string> icon_hashes;
+ base::android::AppendJavaStringArrayToStringVector(
+ env, java_icon_hashes.obj(), &icon_hashes);
+
+ std::map<std::string, std::string> icon_url_to_murmur2_hash;
+ for (size_t i = 0; i < info.icon_urls.size(); ++i)
+ icon_url_to_murmur2_hash[info.icon_urls[i]] = icon_hashes[i];
+
gfx::JavaBitmap java_bitmap_lock(java_best_icon_bitmap);
SkBitmap best_icon_bitmap =
gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock);
best_icon_bitmap.setImmutable();
- std::string best_icon_murmur2_hash;
- ConvertJavaStringToUTF8(env, java_best_icon_murmur2_hash,
- &best_icon_murmur2_hash);
-
std::string webapk_package;
ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package);
@@ -107,5 +112,6 @@ static void UpdateAsync(
installer->UpdateAsync(
profile,
base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id),
- best_icon_murmur2_hash, webapk_package, java_webapk_version);
+ webapk_package, java_webapk_version, icon_url_to_murmur2_hash,
+ java_is_manifest_stale);
}
« no previous file with comments | « chrome/browser/android/webapk/webapk_installer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698