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

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: Fix the compile error. 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
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 c6da1e2d654d581c1326e089726fe6cccd81b047..27d53cbe59b65e13f2d3f04f8012e3f8d7584efc 100644
--- a/chrome/browser/android/webapk/webapk_update_manager.cc
+++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -56,13 +56,15 @@ static void UpdateAsync(
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_hashs,
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_stale_manifest) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
Profile* profile = ProfileManager::GetLastUsedProfile();
@@ -91,6 +93,12 @@ static void UpdateAsync(
base::android::JavaArrayOfByteArrayToStringVector(
env, java_icon_urls.obj(), &info.icon_urls);
+ std::vector<std::string> icon_hashs;
+ if (java_icon_hashs != nullptr) {
+ base::android::AppendJavaStringArrayToStringVector(
+ env, java_icon_hashs.obj(), &icon_hashs);
+ }
+
gfx::JavaBitmap java_bitmap_lock(java_best_icon_bitmap);
SkBitmap best_icon_bitmap =
gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock);
@@ -107,5 +115,6 @@ static void UpdateAsync(
installer->UpdateAsync(
profile,
base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id),
- best_icon_murmur2_hash, webapk_package, java_webapk_version);
+ best_icon_murmur2_hash, webapk_package, java_webapk_version,
+ java_stale_manifest, icon_hashs);
}

Powered by Google App Engine
This is Rietveld 408576698