[Android]: Hide add-to-homescreen app menu item when WebAPK is installed

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java

Index: chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
index 040ceaab4d810b86682c5f3b2b88879706a2fdce..35104149edf80abc916a011ddb99ec38de73340d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenuPropertiesDelegate.java
@@ -4,13 +4,18 @@
 
 package org.chromium.chrome.browser.appmenu;
 
+import android.content.Context;
+import android.content.pm.ResolveInfo;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.os.SystemClock;
 import android.view.Menu;
 import android.view.MenuItem;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.CommandLine;
+import org.chromium.base.ContextUtils;
+import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeFeatureList;
@@ -26,8 +31,12 @@ import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.share.ShareHelper;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.webapps.ChromeWebApkHost;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.ui.base.DeviceFormFactor;
+import org.chromium.webapk.lib.client.WebApkValidator;
+
+import java.util.concurrent.TimeUnit;
 
 /**
  * App Menu helper that handles hiding and showing menu items based on activity state.
@@ -162,13 +171,9 @@ public class AppMenuPropertiesDelegate {
             //                access to the resource via FLAG_GRANT_READ_URI_PERMISSION, and that
             //                is not persisted when adding to the homescreen.
             // * If creating shortcuts it not supported by the current home screen.
-            MenuItem homescreenItem = menu.findItem(R.id.add_to_homescreen_id);
-            boolean homescreenItemVisible = ShortcutHelper.isAddToHomeIntentSupported()
+            boolean canShowHomeScreenMenuItem = ShortcutHelper.isAddToHomeIntentSupported()
                     && !isChromeScheme && !isFileScheme && !isContentScheme && !isIncognito;
-            if (homescreenItemVisible) {
-                homescreenItem.setTitle(AppBannerManager.getHomescreenLanguageOption());
-            }
-            homescreenItem.setVisible(homescreenItemVisible);
+            prepareAddToHomescreenMenuItem(menu, currentTab.getUrl(), canShowHomeScreenMenuItem);
 
             // Hide request desktop site on all chrome:// pages except for the NTP. Check request
             // desktop site if it's activated on this page.
@@ -218,6 +223,45 @@ public class AppMenuPropertiesDelegate {
     }
 
     /**
+     * Sets the visibility and labels of the "Add to Home screen" and "Open WebAPK" menu items.
+     */
+    protected void prepareAddToHomescreenMenuItem(
+            Menu menu, String url, boolean canShowHomeScreenMenuItem) {
+        MenuItem homescreenItem = menu.findItem(R.id.add_to_homescreen_id);
+        MenuItem openWebApkItem = menu.findItem(R.id.open_webapk_id);
+        if (canShowHomeScreenMenuItem) {
+            Context context = ContextUtils.getApplicationContext();
+            ResolveInfo resolveInfo = null;
+            boolean openWebApkItemVisible = false;
+            if (ChromeWebApkHost.isEnabled()) {
+                long addToHomeScreenStart = SystemClock.elapsedRealtime();
+                resolveInfo = WebApkValidator.queryResolveInfo(context, url);
+                RecordHistogram.recordTimesHistogram(
+                        "Android.PrepareMenu.OpenWebApkVisibilityCheck",
+                        SystemClock.elapsedRealtime() - addToHomeScreenStart,
+                        TimeUnit.MILLISECONDS);
+
+                openWebApkItemVisible =
+                        resolveInfo != null && resolveInfo.activityInfo.packageName != null;

[nyquist, 2017/02/28 07:04:19]

The null-check of packageName seems unnecessary here. If that is something that
can happen, we would have already crashed in WebApkValidator#isValidWebApk(...):

  if (!webappPackageName.startsWith(WEBAPK_PACKAGE_PREFIX)) {
    ...

Maybe you could move this null-check of the package name there instead, and just
check if the resolveInfo is null here? At that point openWebApkItemVisible ==
resolveInfo != null, so we conceptually don't need both, but I find the variable
name very helpful so I'd keep it to ensure it's easy to understand for new
readers.

[gonzalon, 2017/02/28 16:12:23]

Great catch. Thanks!

+            }
+            if (openWebApkItemVisible) {
+                String appName = resolveInfo.loadLabel(context.getPackageManager()).toString();
+                openWebApkItem.setTitle(context.getString(R.string.menu_open_webapk, appName));
+
+                homescreenItem.setVisible(false);
+                openWebApkItem.setVisible(true);
+            } else {
+                homescreenItem.setTitle(AppBannerManager.getHomescreenLanguageOption());
+                homescreenItem.setVisible(true);
+                openWebApkItem.setVisible(false);
+            }
+        } else {
+            homescreenItem.setVisible(false);
+            openWebApkItem.setVisible(false);
+        }
+    }
+
+    /**
      * Notify the delegate that the load state changed.
      * @param isLoading Whether the page is currently loading.
      */