[Home] Ensure incognito tab model is created when NTP opened

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

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
index 83bead5f9bfc6521e4aa9fac117ec269c8290342..4bf996e45c6752d68e9120b229dc7789f246fe39 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
@@ -517,13 +517,6 @@ public class BottomSheet
         }
 
         mNtpController.setTabModelSelector(tabModelSelector);
-
-        mTabModelSelector.addObserver(new EmptyTabModelSelectorObserver() {
-            @Override
-            public void onTabModelSelected(TabModel newModel, TabModel oldModel) {
-                setSheetState(SHEET_STATE_PEEK, true);

[Theresa, 2017/05/24 16:52:08]

This was intended to handle the case where all incognito tabs were closed (e.g.
through the notification), but IncognitoNotificationService handles that
directly now.

-            }
-        });
     }
 
     /**
@@ -673,13 +666,6 @@ public class BottomSheet
         loadUrl(params, mTabModelSelector.isIncognitoSelected());
     }
 
-    /**
-     * Called when the activity containing the {@link BottomSheet} processes a url view intent.
-     */
-    public void onProcessUrlViewIntent() {
-        mNtpController.onProcessUrlViewIntent();
-    }
-
     @Override
     public boolean isIncognito() {
         if (getActiveTab() == null) return false;
@@ -693,7 +679,7 @@ public class BottomSheet
 
     @Override
     public Tab getActiveTab() {
-        return mTabModelSelector == null || mNtpController.isShowingNewTab()
+        return mTabModelSelector == null || mNtpController.isShowingNewTabUi()
                 ? null
                 : mTabModelSelector.getCurrentTab();
     }
@@ -1223,7 +1209,7 @@ public class BottomSheet
      *         returns true if a normal or incognito new tab is showing.
      */
     public boolean isShowingNewTab() {
-        return mNtpController.isShowingNewTab();
+        return mNtpController.isShowingNewTabUi();
     }
 
     /**
@@ -1253,7 +1239,7 @@ public class BottomSheet
                 mFindInPageView != null && mFindInPageView.getVisibility() == View.VISIBLE;
 
         return !isToolbarAndroidViewHidden()
-                && (!isInOverviewMode || mNtpController.isShowingNewTab()) && !isFindInPageVisible
+                && (!isInOverviewMode || mNtpController.isShowingNewTabUi()) && !isFindInPageVisible
                 && !blockPeekingSwipes;
     }