| 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 f25b10a1ff643ff63883c773e66608d1662f8725..ece6a6d300ad07787db37af4aced54c0cf739112 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
|
| @@ -561,8 +561,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 DownloadUtils.isDownloadHomeEnabled() && shouldShowPageActionButtons()
|
| - && !tab.isIncognito();
|
| + return shouldShowPageActionButtons() && !tab.isIncognito();
|
| }
|
|
|
| private boolean isSaveOfflineButtonEnabled() {
|
| @@ -573,19 +572,15 @@ public class LocationBarTablet extends LocationBarLayout {
|
| private boolean shouldShowPageActionButtons() {
|
| if (!mNativeInitialized) return true;
|
|
|
| - // If the new downloads UI isn't enabled, the only page action is the bookmark button. It
|
| - // 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() && !DownloadUtils.isDownloadHomeEnabled())
|
| - || !(mUrlBar.hasFocus() || mUrlFocusChangeInProgress);
|
| + // There are two actions, bookmark and save offline, and they should be shown if the
|
| + // omnibox isn't focused.
|
| + return !(mUrlBar.hasFocus() || mUrlFocusChangeInProgress);
|
| }
|
|
|
| private boolean shouldShowMicButton() {
|
| // If the download UI is enabled, the mic button should be only be shown when the url bar
|
| // is focused.
|
| return isVoiceSearchEnabled() && mNativeInitialized
|
| - && (!DownloadUtils.isDownloadHomeEnabled()
|
| - || (mUrlBar.hasFocus() || mUrlFocusChangeInProgress));
|
| + && (mUrlBar.hasFocus() || mUrlFocusChangeInProgress);
|
| }
|
| }
|
|
|