[2840 Download Home] More effectively disable Download Home

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java

Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java
index 805a9e927f37412875bdef41031282ed487aae7f..b61cf200d6b83de8985398908c234956068081c2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarTablet.java
@@ -18,8 +18,8 @@ import android.view.WindowManager;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.UrlConstants;
+import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.toolbar.ToolbarTablet;
@@ -562,7 +562,7 @@ public class LocationBarTablet extends LocationBarLayout {
         if (tab == null) return false;
         // The save offline button should not be shown on native pages. Currently, trying to
         // save an offline page in incognito crashes, so don't show it on incognito either.
-        return ChromeFeatureList.isEnabled("DownloadsUi") && shouldShowPageActionButtons()
+        return DownloadUtils.isDownloadHomeEnabled() && shouldShowPageActionButtons()
                 && !tab.isIncognito();
     }
 
@@ -584,7 +584,7 @@ public class LocationBarTablet extends LocationBarLayout {
         // should be shown if the delete button isn't showing. If the download UI is enabled, there
         // are two actions, bookmark and save offline, and they should be shown if the omnibox isn't
         // focused.
-        return (!shouldShowDeleteButton() && !ChromeFeatureList.isEnabled("DownloadsUi"))
+        return (!shouldShowDeleteButton() && !DownloadUtils.isDownloadHomeEnabled())
                 || !(mUrlBar.hasFocus() || mUrlFocusChangeInProgress);
     }
 
@@ -592,7 +592,7 @@ public class LocationBarTablet extends LocationBarLayout {
         // If the download UI is enabled, the mic button should be only be shown when the url bar
         // is focused.
         return isVoiceSearchEnabled() && mNativeInitialized
-                && (!ChromeFeatureList.isEnabled("DownloadsUi")
+                && (!DownloadUtils.isDownloadHomeEnabled()
                         || (mUrlBar.hasFocus() || mUrlFocusChangeInProgress));
     }
 }