From 6b613c21714760e92cf25497e88e7a1bfdaeb49f Mon Sep 17 00:00:00 2001
From: uazo <29201891+uazo@users.noreply.github.com>
Date: Thu, 4 Nov 2021 09:20:19 +0100
Subject: [PATCH] Keep empty tabs between sessions (#1515)

---
 .../Keep-empty-tabs-between-sessions.patch    | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 build/patches/Keep-empty-tabs-between-sessions.patch

diff --git a/build/patches/Keep-empty-tabs-between-sessions.patch b/build/patches/Keep-empty-tabs-between-sessions.patch
new file mode 100644
index 00000000..7b27c393
--- /dev/null
+++ b/build/patches/Keep-empty-tabs-between-sessions.patch
@@ -0,0 +1,45 @@
+From: uazo <uazo@users.noreply.github.com>
+Date: Wed, 27 Oct 2021 10:57:09 +0000
+Subject: Keep empty tabs between sessions
+
+---
+ .../chrome/browser/tabmodel/TabPersistentStore.java      | 9 ---------
+ .../browser/tab/state/CriticalPersistedTabData.java      | 4 ----
+ 2 files changed, 13 deletions(-)
+
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+@@ -734,15 +734,6 @@ public class TabPersistentStore {
+                     .createFrozenTab(tabState, serializedCriticalPersistedTabData, tabToRestore.id,
+                             isIncognito, restoredIndex);
+         } else {
+-            if (UrlUtilities.isNTPUrl(tabToRestore.url) && !setAsActive
+-                    && !tabToRestore.fromMerge) {
+-                Log.i(TAG, "Skipping restore of non-selected NTP.");
+-                return;
+-            } else if (TextUtils.isEmpty(tabToRestore.url)) {
+-                Log.i(TAG, "Skipping restore of empty Tabs.");
+-                return;
+-            }
+-
+             Log.w(TAG, "Failed to restore TabState; creating Tab with last known URL.");
+             Tab fallbackTab = mTabCreatorManager.getTabCreator(isIncognito)
+                                       .createNewTab(new LoadUrlParams(tabToRestore.url),
+diff --git a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java
+--- a/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java
++++ b/chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java
+@@ -438,10 +438,6 @@ public class CriticalPersistedTabData extends PersistedTabData {
+         if (getUrl() == null || TextUtils.isEmpty(getUrl().getSpec())) {
+             return false;
+         }
+-        if (UrlUtilities.isNTPUrl(getUrl().getSpec()) && !mTab.canGoBack()
+-                && !mTab.canGoForward()) {
+-            return false;
+-        }
+         if (isTabUrlContentScheme(getUrl().getSpec())) {
+             return false;
+         }
+-- 
+2.17.1
+