63 lines
3.2 KiB
Diff
63 lines
3.2 KiB
Diff
From: uazo <uazo@users.noreply.github.com>
|
|
Date: Wed, 27 Oct 2021 10:57:09 +0000
|
|
Subject: Keep empty tabs between sessions
|
|
|
|
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|
---
|
|
.../chrome/browser/multiwindow/MultiWindowUtils.java | 2 +-
|
|
.../browser/tabmodel/TabPersistentStoreImpl.java | 7 -------
|
|
.../chrome/browser/tabmodel/TabPersistenceUtils.java | 10 ----------
|
|
3 files changed, 1 insertion(+), 18 deletions(-)
|
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.java
|
|
@@ -1305,7 +1305,7 @@ public class MultiWindowUtils implements ActivityStateListener {
|
|
int totalCount = 0;
|
|
for (TabModel model : models) {
|
|
for (Tab tab : model) {
|
|
- if (!TabPersistenceUtils.shouldSkipTab(tab)) {
|
|
+ if ((true)) {
|
|
totalCount++;
|
|
}
|
|
}
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreImpl.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreImpl.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreImpl.java
|
|
@@ -1939,13 +1939,6 @@ public class TabPersistentStoreImpl implements TabPersistentStore {
|
|
continue;
|
|
}
|
|
|
|
- if (index == activeIndex) {
|
|
- // If any non-active NTPs have been skipped, the serialized tab model index
|
|
- // needs to be adjusted.
|
|
- modelInfo.index = modelInfo.ids.size();
|
|
- } else if (TabPersistenceUtils.shouldSkipTab(tab)) {
|
|
- continue;
|
|
- }
|
|
modelInfo.ids.add(tab.getId());
|
|
modelInfo.urls.add(tab.getUrl().getSpec());
|
|
}
|
|
diff --git a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistenceUtils.java b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistenceUtils.java
|
|
--- a/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistenceUtils.java
|
|
+++ b/chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistenceUtils.java
|
|
@@ -17,16 +17,6 @@ public class TabPersistenceUtils {
|
|
*
|
|
* @param tab The tab to check.
|
|
*/
|
|
- public static boolean shouldSkipTab(Tab tab) {
|
|
- // Don't skip the tab if it is pinned.
|
|
- if (tab.getIsPinned()) return false;
|
|
-
|
|
- boolean isNtp = tab.isNativePage() && UrlUtilities.isNtpUrl(tab.getUrl());
|
|
- if (!isNtp) return false;
|
|
-
|
|
- // Only skip NTP tabs that are not in a tab group.
|
|
- return tab.getTabGroupId() == null;
|
|
- }
|
|
|
|
/**
|
|
* Returns true if the tab should be skipped when loading persisted tabs.
|
|
--
|