🏡 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 135 matching lines @@
             MenuItem requestItem = menu.findItem(R.id.request_desktop_site_id);
             updateRequestDesktopSiteMenuItem(requestItem, currentTab);
 
             // Only display reader mode settings menu option if the current page is in reader mode.
             menu.findItem(R.id.reader_mode_prefs_id)
                     .setVisible(DomDistillerUrlUtils.isDistilledPage(currentTab.getUrl()));
 
             // Only display the Enter VR button if VR Shell Dev environment is enabled.
             menu.findItem(R.id.enter_vr_id).setVisible(
                     CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_VR_SHELL_DEV));
+
+            if (FeatureUtilities.isChromeHomeEnabled()) {
+                // History, downloads, and and bookmarks are shown in the Chrome Home bottom sheet.

[Theresa, 2017/03/16 18:15:16]

nit: remove the second "and"

[Theresa, 2017/03/16 21:55:44]

Done.

+                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);
+            }
         }
 
         if (isOverviewMenu) {
             if (isIncognito) {
                 // Hide normal close all tabs item.
                 menu.findItem(R.id.close_all_tabs_menu_id).setVisible(false);
                 // Enable close incognito tabs only if there are incognito tabs.
                 menu.findItem(R.id.close_all_incognito_tabs_menu_id).setEnabled(true);
             } else {
                 // Hide close incognito tabs item.
@@ skipping 133 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));
     }
 }