[Shortcuts] Include the shortcut icon url in the shell.

This is needed for the stale manifest use case.

Bug: 1045588
Change-Id: I7deb018afa062f829cc13247ab7faaa86da8a129
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2050274Reviewed-by: Peter Kotwicz <pkotwicz@chromium.org>
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743057}

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkIntentDataProviderFactory.java

@@ -62,6 +62,7 @@ public class WebApkIntentDataProviderFactory {
     private static final String SHORTCUT_NAME_ATTRIBUTE = "shortcutLongLabel";
     private static final String SHORTCUT_SHORT_NAME_ATTRIBUTE = "shortcutShortLabel";
     private static final String SHORTCUT_ICON_HASH_ATTRIBUTE = "iconHash";
+    private static final String SHORTCUT_ICON_URL_ATTRIBUTE = "iconUrl";
     private static final String SHORTCUT_INTENT_LAUNCH_URL_ATTRIBUTE = "data";
 
     private static final String TAG = "WebApkInfo";
@@ -166,6 +167,7 @@ public class WebApkIntentDataProviderFactory {
                             SHORTCUT_ATTRIBUTE_NAMESPACE, SHORTCUT_NAME_ATTRIBUTE, 0);
                     int shortNameResId = parser.getAttributeResourceValue(
                             SHORTCUT_ATTRIBUTE_NAMESPACE, SHORTCUT_SHORT_NAME_ATTRIBUTE, 0);
+                    String iconUrl = parser.getAttributeValue(null, SHORTCUT_ICON_URL_ATTRIBUTE);
                     String iconHash = parser.getAttributeValue(null, SHORTCUT_ICON_HASH_ATTRIBUTE);
 
                     eventType = parser.next();
@@ -178,11 +180,9 @@ public class WebApkIntentDataProviderFactory {
                     String launchUrl = parser.getAttributeValue(
                             SHORTCUT_ATTRIBUTE_NAMESPACE, SHORTCUT_INTENT_LAUNCH_URL_ATTRIBUTE);
 
-                    // The |iconUrl| is not required, only a change in the icon hash will trigger an
-                    // update.
                     shortcuts.add(new ShortcutItem(nameResId != 0 ? res.getString(nameResId) : "",
                             shortNameResId != 0 ? res.getString(shortNameResId) : "", launchUrl,
-                            "" /* iconUrl */, iconHash));
+                            iconUrl, iconHash));
                 }
                 eventType = parser.next();
             }

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApkInfoTest.java

@@ -728,6 +728,7 @@ public class WebApkInfoTest {
                 + "  <shortcut"
                 + "    android:shortcutId='shortcut_1'"
                 + "    android:icon='@drawable/shortcut_1_icon'"
+                + "    iconUrl='https://example.com/icon1.png'"
                 + "    iconHash='1234'"
                 + "    android:shortcutShortLabel='@string/shortcut_1_short_name'"
                 + "    android:shortcutLongLabel='@string/shortcut_1_name'>"
@@ -742,6 +743,7 @@ public class WebApkInfoTest {
         Assert.assertEquals(item.name, "name1");
         Assert.assertEquals(item.shortName, "short name1");
         Assert.assertEquals(item.launchUrl, "https://example.com/launch1");
+        Assert.assertEquals(item.iconUrl, "https://example.com/icon1.png");
         Assert.assertEquals(item.iconHash, "1234");
 
         // Multiple shortcuts case.
@@ -750,6 +752,7 @@ public class WebApkInfoTest {
                 + "  <shortcut"
                 + "    android:shortcutId='shortcut_1'"
                 + "    android:icon='@drawable/shortcut_1_icon'"
+                + "    iconUrl='https://example.con/icon1.png'"
                 + "    iconHash='1234'"
                 + "    android:shortcutShortLabel='@string/shortcut_1_short_name'"
                 + "    android:shortcutLongLabel='@string/shortcut_1_name'>"
@@ -758,6 +761,7 @@ public class WebApkInfoTest {
                 + "  <shortcut"
                 + "    android:shortcutId='shortcut_2'"
                 + "    android:icon='@drawable/shortcut_2_icon'"
+                + "    iconUrl='https://example.com/icon2.png'"
                 + "    iconHash='2345'"
                 + "    android:shortcutShortLabel='@string/shortcut_2_short_name'"
                 + "    android:shortcutLongLabel='@string/shortcut_2_name'>"
@@ -772,6 +776,7 @@ public class WebApkInfoTest {
         Assert.assertEquals(item.name, "name2");
         Assert.assertEquals(item.shortName, "short name2");
         Assert.assertEquals(item.launchUrl, "https://example.com/launch2");
+        Assert.assertEquals(item.iconUrl, "https://example.com/icon2.png");
         Assert.assertEquals(item.iconHash, "2345");
     }
 }

chrome/android/webapk/shell_apk/current_version/current_version.gni

@@ -12,4 +12,4 @@
 # //chrome/android/webapk/shell_apk:webapk is changed. This includes
 # Java files, Android resource files and AndroidManifest.xml. Does not affect
 # Chrome.apk
-current_shell_apk_version = 121
+current_shell_apk_version = 122

chrome/android/webapk/shell_apk/res/xml/shortcuts.xml

@@ -4,6 +4,7 @@
   <shortcut
     android:shortcutId='shortcut_1'
     android:icon='@drawable/shortcut_1_icon'
+    iconUrl='{{{icon_url}}}'
     iconHash='{{{icon_hash}}}'
     android:shortcutShortLabel='@string/shortcut_1_short_name'
     android:shortcutLongLabel='@string/shortcut_1_name'>
@@ -19,6 +20,7 @@
   <shortcut
     android:shortcutId='shortcut_2'
     android:icon='@drawable/shortcut_2_icon'
+    iconUrl='{{{icon_url}}}'
     iconHash='{{{icon_hash}}}'
     android:shortcutShortLabel='@string/shortcut_2_short_name'
     android:shortcutLongLabel='@string/shortcut_2_name'>
@@ -34,6 +36,7 @@
   <shortcut
     android:shortcutId='shortcut_3'
     android:icon='@drawable/shortcut_3_icon'
+    iconUrl='{{{icon_url}}}'
     iconHash='{{{icon_hash}}}'
     android:shortcutShortLabel='@string/shortcut_3_short_name'
     android:shortcutLongLabel='@string/shortcut_3_name'>
@@ -49,6 +52,7 @@
   <shortcut
     android:shortcutId='shortcut_4'
     android:icon='@drawable/shortcut_4_icon'
+    iconUrl='{{{icon_url}}}'
     iconHash='{{{icon_hash}}}'
     android:shortcutShortLabel='@string/shortcut_4_short_name'
     android:shortcutLongLabel='@string/shortcut_4_name'>