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

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java

 // Copyright 2014 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.tabmodel;
 
 import org.chromium.base.ObserverList;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
 import org.chromium.chrome.browser.profiles.Profile;
@@ skipping 18 matching lines @@
         TabModel createTabModel();
 
         /** @return Whether Incognito Tabs exist. */
         boolean doIncognitoTabsExist();
     }
 
     private final IncognitoTabModelDelegate mDelegate;
     private final ObserverList<TabModelObserver> mObservers = new ObserverList<TabModelObserver>();
     private TabModel mDelegateModel;
     private boolean mIsAddingTab;
+    private boolean mIsPendingTabAdd;
 
     /**
      * Constructor for IncognitoTabModel.
      */
     public IncognitoTabModel(IncognitoTabModelDelegate tabModelCreator) {
         mDelegate = tabModelCreator;
         mDelegateModel = EmptyTabModel.getInstance();
     }
 
     /**
@@ skipping 16 matching lines @@
     protected TabModel getDelegateModel() {
         return mDelegateModel;
     }
 
     /**
      * Destroys the Incognito profile when all Incognito tabs have been closed.  Also resets the
      * delegate TabModel to be a stub EmptyTabModel.
      */
     protected void destroyIncognitoIfNecessary() {
         ThreadUtils.assertOnUiThread();
-        if (!isEmpty() || mDelegateModel instanceof EmptyTabModel || mIsAddingTab) {
+        if (!isEmpty() || mDelegateModel instanceof EmptyTabModel || mIsAddingTab
+                || mIsPendingTabAdd) {
             return;
         }
 
         Profile profile = getProfile();
         mDelegateModel.destroy();
 
         // Only delete the incognito profile if there are no incognito tabs open in any tab
         // model selector as the profile is shared between them.
-        if (profile != null && !mDelegate.doIncognitoTabsExist()) {
+        if (profile != null && !mDelegate.doIncognitoTabsExist()
+                && TabWindowManager.getInstance().canDestroyIncognitoProfile()) {

[Ted C, 2017/05/24 17:56:08]

I think this should go into the delegate doIncognitoTabsExist, which is where
the other TabWindowManager call is

[Theresa, 2017/05/24 18:35:46]

Done.

             IncognitoNotificationManager.dismissIncognitoNotification();
 
             profile.destroyWhenAppropriate();
         }
 
         mDelegateModel = EmptyTabModel.getInstance();
     }
 
     private boolean isEmpty() {
         return getComprehensiveModel().getCount() == 0;
@@ skipping 110 matching lines @@
     }
 
     @Override
     public void cancelTabClosure(int tabId) {
         mDelegateModel.cancelTabClosure(tabId);
     }
 
     @Override
     public void addTab(Tab tab, int index, TabLaunchType type) {
         mIsAddingTab = true;
+        mIsPendingTabAdd = false;
         ensureTabModelImpl();
         mDelegateModel.addTab(tab, index, type);
         mIsAddingTab = false;
     }
 
     @Override
     public void addObserver(TabModelObserver observer) {
         mObservers.addObserver(observer);
         mDelegateModel.addObserver(observer);
     }
 
     @Override
     public void removeObserver(TabModelObserver observer) {
         mObservers.removeObserver(observer);
         mDelegateModel.removeObserver(observer);
     }
 
     @Override
     public void removeTab(Tab tab) {
         mDelegateModel.removeTab(tab);
         // Call destroyIncognitoIfNecessary() in case the last incognito tab in this model is
         // reparented to a different activity. See crbug.com/611806.
         destroyIncognitoIfNecessary();
     }
 
     @Override
     public void openMostRecentlyClosedTab() {
     }
 
+    @Override
+    public void setIsPendingTabAdd(boolean isPendingTabAdd) {
+        mIsPendingTabAdd = isPendingTabAdd;
+        if (mIsPendingTabAdd) {
+            ensureTabModelImpl();
+        } else {
+            destroyIncognitoIfNecessary();
+        }
+    }
+
+    @Override
+    public boolean isPendingTabAdd() {
+        return mIsPendingTabAdd;

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

Ted, should this also return true if mIsAddingTab is true? I think in practice
it would be hard to have one activity trying to destroy incognito while another
is in the middle of #addTab() but perhaps it's possible.

[Ted C, 2017/05/24 17:56:08]

I don't think we need to.  The mIsAddingTab is done within a single execution
block on the UI thread, so there definitely shouldn't be a way for the deletion
to happen in the middle (if we do, it is a threading violation in some other
part of the code)

[Theresa, 2017/05/24 18:35:46]

Excellent, thanks!

+    }
 }