| Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java
|
| index 671b45bff03e9f36d3770b148c1f0c6709864de7..c267b53d7295b83fae44066c81656d8233473657 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateDataFetcher.java
|
| @@ -99,21 +99,23 @@ public class WebApkUpdateDataFetcher extends EmptyTabObserver {
|
| */
|
| @CalledByNative
|
| protected void onDataAvailable(String manifestStartUrl, String scopeUrl, String name,
|
| - String shortName, String bestIconUrl, String bestIconMurmur2Hash, Bitmap bestIconBitmap,
|
| - String[] iconUrls, int displayMode, int orientation, long themeColor,
|
| - long backgroundColor) {
|
| + String shortName, String primaryIconUrl, String primaryIconMurmur2Hash,
|
| + Bitmap primaryIconBitmap, String[] iconUrls, int displayMode, int orientation,
|
| + long themeColor, long backgroundColor) {
|
| HashMap<String, String> iconUrlToMurmur2HashMap = new HashMap<String, String>();
|
| for (String iconUrl : iconUrls) {
|
| - String murmur2Hash = (iconUrl.equals(bestIconUrl)) ? bestIconMurmur2Hash : null;
|
| + String murmur2Hash = (iconUrl.equals(primaryIconUrl)) ? primaryIconMurmur2Hash : null;
|
| iconUrlToMurmur2HashMap.put(iconUrl, murmur2Hash);
|
| }
|
|
|
| + Bitmap badgeIconBitmap = null;
|
| WebApkInfo info = WebApkInfo.create(mOldInfo.id(), mOldInfo.uri().toString(),
|
| - mOldInfo.shouldForceNavigation(), scopeUrl, new WebApkInfo.Icon(bestIconBitmap),
|
| - name, shortName, displayMode, orientation, mOldInfo.source(), themeColor,
|
| - backgroundColor, mOldInfo.webApkPackageName(), mOldInfo.shellApkVersion(),
|
| - mOldInfo.manifestUrl(), manifestStartUrl, iconUrlToMurmur2HashMap);
|
| - mObserver.onGotManifestData(info, bestIconUrl);
|
| + mOldInfo.shouldForceNavigation(), scopeUrl, new WebApkInfo.Icon(primaryIconBitmap),
|
| + new WebApkInfo.Icon(badgeIconBitmap), name, shortName, displayMode, orientation,
|
| + mOldInfo.source(), themeColor, backgroundColor, mOldInfo.webApkPackageName(),
|
| + mOldInfo.shellApkVersion(), mOldInfo.manifestUrl(), manifestStartUrl,
|
| + iconUrlToMurmur2HashMap);
|
| + mObserver.onGotManifestData(info, primaryIconUrl);
|
| }
|
|
|
| /**
|
|
|