🏡 Show correct BottomSheetContent toolbar when contents swapped

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryManagerToolbar.java

 // Copyright 2016 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.history;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.Menu;
 import android.view.MenuItem;
@@ skipping 18 matching lines @@
 
         updateMenuItemVisibility();
     }
 
     /**
      * @param manager The {@link HistoryManager} associated with this toolbar.
      */
     public void setManager(HistoryManager manager) {
         mManager = manager;
 
-        if (mManager.isDisplayedInNativePage()) {
+        if (!mManager.isDisplayedInSeparateActivity()) {
             getMenu().removeItem(R.id.close_menu_id);
         }
     }
 
     @Override
     public void onSelectionStateChange(List<HistoryItem> selectedItems) {
         boolean wasSelectionEnabled = mIsSelectionEnabled;
         super.onSelectionStateChange(selectedItems);
 
         if (mIsSelectionEnabled) {
@@ skipping 45 matching lines @@
             if (item.getItemId() == menuItemId) return item;
         }
         return null;
     }
 
     @VisibleForTesting
     Menu getMenuForTests() {
         return getMenu();
     }
 }