🏡 Show correct BottomSheetContent toolbar when contents swapped

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.appmenu;
 
 import android.content.Context;
 import android.content.pm.ResolveInfo;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
@@ skipping 12 matching lines @@
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.banners.AppBannerManager;
 import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
 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.util.FeatureUtilities;
 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.
  */
 public class AppMenuPropertiesDelegate {
@@ skipping 152 matching lines @@
                 menu.findItem(R.id.close_all_incognito_tabs_menu_id).setEnabled(true);
             } else {
                 // Hide close incognito tabs item.
                 menu.findItem(R.id.close_all_incognito_tabs_menu_id).setVisible(false);
                 // Enable close all tabs if there are normal tabs or incognito tabs.
                 menu.findItem(R.id.close_all_tabs_menu_id).setEnabled(
                         mActivity.getTabModelSelector().getTotalTabCount() > 0);
             }
         }
 
+        if (FeatureUtilities.isChromeHomeEnabled()) {

[mdjones, 2017/03/14 20:08:36]

Can you make sure this works in custom tabs?

[Theresa, 2017/03/14 20:40:02]

None of these menu items are shown in custom tabs -- that menu is controlled by
CustomTabAppMenuPropertiesDelegate:
https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chr...

I did move this inside of the if (isPageMenu..) block since that is the only
group these are valid for. And I tested in custom tabs as a sanity check.

+            menu.findItem(R.id.open_history_menu_id).setVisible(false);
+            menu.findItem(R.id.downloads_menu_id).setVisible(false);
+            menu.findItem(R.id.all_bookmarks_menu_id).setVisible(false);
+        }
+
         // Disable new incognito tab when it is blocked (e.g. by a policy).
         // findItem(...).setEnabled(...)" is not enough here, because of the inflated
         // main_menu.xml contains multiple items with the same id in different groups
         // e.g.: new_incognito_tab_menu_id.
         disableEnableMenuItem(menu, R.id.new_incognito_tab_menu_id,
                 true,
                 PrefServiceBridge.getInstance().isIncognitoModeEnabled(),
                 PrefServiceBridge.getInstance().isIncognitoModeManaged());
         mActivity.prepareMenu(menu);
     }
@@ skipping 116 matching lines @@
         String url = currentTab.getUrl();
         boolean isChromeScheme = url.startsWith(UrlConstants.CHROME_URL_PREFIX)
                 || url.startsWith(UrlConstants.CHROME_NATIVE_URL_PREFIX);
         requstMenuItem.setVisible(!isChromeScheme || currentTab.isNativePage());
         requstMenuItem.setChecked(currentTab.getUseDesktopUserAgent());
         requstMenuItem.setTitleCondensed(requstMenuItem.isChecked()
                 ? mActivity.getString(R.string.menu_request_desktop_site_on)
                 : mActivity.getString(R.string.menu_request_desktop_site_off));
     }
 }