🏠 Close the bottom sheet when opening link in incognito

chrome/android/java/src/org/chromium/chrome/browser/widget/BottomSheet.java

 // Copyright 2017 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.widget;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ skipping 374 matching lines @@
 
         mPlaceholder = new View(getContext());
         LayoutParams placeHolderParams =
                 new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
         mPlaceholder.setBackgroundColor(
                 ApiCompatibilityUtils.getColor(getResources(), android.R.color.white));
         mBottomSheetContentContainer.addView(mPlaceholder, placeHolderParams);
     }
 
     @Override
-    public int loadUrl(LoadUrlParams params) {
+    public int loadUrl(LoadUrlParams params, boolean incognito) {
         for (BottomSheetObserver o : mObservers) o.onLoadUrl(params.getUrl());
 
         // Native page URLs in this context do not need to communicate with the tab.
-        if (NativePageFactory.isNativePageUrl(params.getUrl(), isIncognito())) {
+        if (NativePageFactory.isNativePageUrl(params.getUrl(), incognito)) {
             return TabLoadStatus.PAGE_LOAD_FAILED;
         }
 
         // In all non-native cases, minimize the sheet.
         setSheetState(SHEET_STATE_PEEK, true);
 
         assert mTabModelSelector != null;
 
         // First try to get the tab behind the sheet.
-        if (mTabModelSelector.getCurrentTab() != null) {
-            return mTabModelSelector.getCurrentTab().loadUrl(params);
+        if (getActiveTab() != null && getActiveTab().isIncognito() == incognito) {
+            return getActiveTab().loadUrl(params);
         }
 
-        // If no tab is active behind the sheet, open a new one.
+        // If no compatible tab is active behind the sheet, open a new one.
         mTabModelSelector.openNewTab(
-                params, TabModel.TabLaunchType.FROM_CHROME_UI, null, isIncognito());
+                params, TabModel.TabLaunchType.FROM_CHROME_UI, getActiveTab(), incognito);
         return TabLoadStatus.DEFAULT_PAGE_LOAD;
     }
 
     @Override
     public boolean isIncognito() {
         if (getActiveTab() == null) return false;
         return getActiveTab().isIncognito();
     }
 
     @Override
@@ skipping 371 matching lines @@
     @Override
     public void onFadingViewVisibilityChanged(boolean visible) {}
 
     private boolean canMoveSheet() {
         boolean isInOverviewMode = mTabModelSelector != null
                 && (mTabModelSelector.getCurrentTab() == null
                            || mTabModelSelector.getCurrentTab().getActivity().isInOverviewMode());
         return !isToolbarAndroidViewHidden() && !isInOverviewMode;
     }
 }