Skip to content

Remove FXIOS-14327 [Clean up] Inactive tabs removal part 2 (final) #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hila-f-qodo wants to merge 5 commits into
base: devin_pr_code_review_bench_100_devin2_base_remove_fxios-14327_clean_up_inactive_tabs_removal_part_2_final_pr230
Choose a base branch
from
Open

Remove FXIOS-14327 [Clean up] Inactive tabs removal part 2 (final) #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a98fbc
Remove inactive tabs UI + middleware
lmarceau Dec 8, 2025
702ad98
Fix tests
lmarceau Dec 8, 2025
d37053e
Fix tab section number
lmarceau Dec 8, 2025
f3df4ed
Fixes following comments
lmarceau Dec 9, 2025
f7001a1
update pr
tomerqodo Jan 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions firefox-ios/Client.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,6 @@
21996BAB2AE95AFC00E0D55F /* TabTrayPanelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21996BAA2AE95AFC00E0D55F /* TabTrayPanelType.swift */; };
2199A1D22DB80B6C00DC84BD /* ZoomPageManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2199A1D12DB80B6C00DC84BD /* ZoomPageManagerTests.swift */; };
2199A1D42DB8389000DC84BD /* MockZoomStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2199A1D32DB8389000DC84BD /* MockZoomStore.swift */; };
219A0FD52ACC8506009A6D1A /* InactiveTabsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219A0FD42ACC8506009A6D1A /* InactiveTabsCell.swift */; };
219A0FD72ACC8C03009A6D1A /* InactiveTabsHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219A0FD62ACC8C03009A6D1A /* InactiveTabsHeaderView.swift */; };
219A0FD92ACC8C0F009A6D1A /* InactiveTabsFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219A0FD82ACC8C0F009A6D1A /* InactiveTabsFooterView.swift */; };
219A0FDB2ACCCFFC009A6D1A /* InactiveTabsSectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219A0FDA2ACCCFFC009A6D1A /* InactiveTabsSectionManager.swift */; };
219AEE4A2E5E38BD00BF5F6F /* TabProviderAdapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219AEE492E5E38B200BF5F6F /* TabProviderAdapter.swift */; };
219AEECE2E5E524300BF5F6F /* MockTabProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219AEECD2E5E523600BF5F6F /* MockTabProviderProtocol.swift */; };
219F27152EA2956100AE4536 /* MockBrowserViewControllerWebViewDelegates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 219F27142EA2956100AE4536 /* MockBrowserViewControllerWebViewDelegates.swift */; };
Expand Down Expand Up @@ -341,7 +337,6 @@
21EEAA192D3852B300595119 /* BookmarksTelemetry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21EEAA182D3852B300595119 /* BookmarksTelemetry.swift */; };
21EEAA1B2D3AE3B300595119 /* BookmarksTelemetryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21EEAA1A2D3AE3B300595119 /* BookmarksTelemetryTests.swift */; };
21EEAA1D2D4005DE00595119 /* NativeErrorPageFeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21EEAA1C2D4005DE00595119 /* NativeErrorPageFeatureFlag.swift */; };
21F2A2D22B0BC85200626AEC /* InactiveTabsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21F2A2D12B0BC85200626AEC /* InactiveTabsModel.swift */; };
21F2A2D42B0D194A00626AEC /* TabsPanelStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21F2A2D32B0D194A00626AEC /* TabsPanelStateTests.swift */; };
21F422662E315E5C004FF994 /* LegacyTabScrollController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21F422652E315E55004FF994 /* LegacyTabScrollController.swift */; };
21F96EE42D41830300A164A0 /* NativeErrorPageFeatureFlagTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 21F96EE22D41830300A164A0 /* NativeErrorPageFeatureFlagTests.swift */; };
Expand Down Expand Up @@ -2999,10 +2994,6 @@
21996BAA2AE95AFC00E0D55F /* TabTrayPanelType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabTrayPanelType.swift; sourceTree = "<group>"; };
2199A1D12DB80B6C00DC84BD /* ZoomPageManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomPageManagerTests.swift; sourceTree = "<group>"; };
2199A1D32DB8389000DC84BD /* MockZoomStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockZoomStore.swift; sourceTree = "<group>"; };
219A0FD42ACC8506009A6D1A /* InactiveTabsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InactiveTabsCell.swift; sourceTree = "<group>"; };
219A0FD62ACC8C03009A6D1A /* InactiveTabsHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InactiveTabsHeaderView.swift; sourceTree = "<group>"; };
219A0FD82ACC8C0F009A6D1A /* InactiveTabsFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InactiveTabsFooterView.swift; sourceTree = "<group>"; };
219A0FDA2ACCCFFC009A6D1A /* InactiveTabsSectionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InactiveTabsSectionManager.swift; sourceTree = "<group>"; };
219AEE492E5E38B200BF5F6F /* TabProviderAdapter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabProviderAdapter.swift; sourceTree = "<group>"; };
219AEECD2E5E523600BF5F6F /* MockTabProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTabProviderProtocol.swift; sourceTree = "<group>"; };
219F27142EA2956100AE4536 /* MockBrowserViewControllerWebViewDelegates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockBrowserViewControllerWebViewDelegates.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3033,7 +3024,6 @@
21EEAA182D3852B300595119 /* BookmarksTelemetry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksTelemetry.swift; sourceTree = "<group>"; };
21EEAA1A2D3AE3B300595119 /* BookmarksTelemetryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksTelemetryTests.swift; sourceTree = "<group>"; };
21EEAA1C2D4005DE00595119 /* NativeErrorPageFeatureFlag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeErrorPageFeatureFlag.swift; sourceTree = "<group>"; };
21F2A2D12B0BC85200626AEC /* InactiveTabsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InactiveTabsModel.swift; sourceTree = "<group>"; };
21F2A2D32B0D194A00626AEC /* TabsPanelStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabsPanelStateTests.swift; sourceTree = "<group>"; };
21F422652E315E55004FF994 /* LegacyTabScrollController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyTabScrollController.swift; sourceTree = "<group>"; };
21F96EE22D41830300A164A0 /* NativeErrorPageFeatureFlagTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeErrorPageFeatureFlagTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -11889,23 +11879,12 @@
1DDE3DB62AC3820A0039363B /* TabModel.swift */,
219935E62B05447C00E5966F /* TabDisplayModel.swift */,
219935EB2B07110900E5966F /* TabTrayModel.swift */,
21F2A2D12B0BC85200626AEC /* InactiveTabsModel.swift */,
5A9F83432B2B8CE900272819 /* TabPeekModel.swift */,
ED28DAC82C45A95F00D2641C /* TabScrollBehaviorModel.swift */,
);
path = Models;
sourceTree = "<group>";
};
219A0FD32ACC84C5009A6D1A /* InactiveTabs */ = {
isa = PBXGroup;
children = (
219A0FD42ACC8506009A6D1A /* InactiveTabsCell.swift */,
219A0FD62ACC8C03009A6D1A /* InactiveTabsHeaderView.swift */,
219A0FD82ACC8C0F009A6D1A /* InactiveTabsFooterView.swift */,
);
path = InactiveTabs;
sourceTree = "<group>";
};
21B548932B1E5EC000DC1DF8 /* Middleware */ = {
isa = PBXGroup;
children = (
Expand All @@ -11918,7 +11897,6 @@
21C5B3572AF2A6D80093F366 /* LayoutManager */ = {
isa = PBXGroup;
children = (
219A0FDA2ACCCFFC009A6D1A /* InactiveTabsSectionManager.swift */,
21B359C52AEAC20300FF09E3 /* TabsSectionManager.swift */,
);
path = LayoutManager;
Expand All @@ -11934,7 +11912,6 @@
8AC6F2232D6E243F00D10A9F /* ExperimentEmptyPrivateTabsView.swift */,
8AC6F2252D6E263500D10A9F /* ExperimentRemoteTabsEmptyView.swift */,
8A2068362D6D52830063A77B /* ExperimentTabCell.swift */,
219A0FD32ACC84C5009A6D1A /* InactiveTabs */,
1D2F68B02ACCA22000524B92 /* RemoteTabsEmptyView.swift */,
1DEBC55D2AC4ED70006E4801 /* RemoteTabsPanel.swift */,
1D2F68AE2ACB272500524B92 /* RemoteTabsViewController.swift */,
Expand Down Expand Up @@ -18521,7 +18498,6 @@
39BF0CD52EB512A1002064F5 /* ImpressionTrackingUtility.swift in Sources */,
D3BE7B461B054F8600641031 /* UITestAppDelegate.swift in Sources */,
C8DC90C72A06759E0008832B /* MarkupAttributionUtility.swift in Sources */,
219A0FD52ACC8506009A6D1A /* InactiveTabsCell.swift in Sources */,
8A1CBB992BE01839008BE4D4 /* MicrosurveyPromptState.swift in Sources */,
C28094312ECF877D0083BC16 /* TranslationsServiceError.swift in Sources */,
23D57E6E25ED6F2700883FAD /* SearchViewController.swift in Sources */,
Expand Down Expand Up @@ -18682,7 +18658,6 @@
21618A632A422A3900A5189E /* ThemeMiddleware.swift in Sources */,
0E77DF0F2CB8220000B80BA1 /* GeneratedPasswordStorage.swift in Sources */,
BA1237C32DAE6D5700BB6333 /* AddressBarSettingsView.swift in Sources */,
219A0FDB2ACCCFFC009A6D1A /* InactiveTabsSectionManager.swift in Sources */,
B2981F8A2B71AD7A00132C1B /* AutofillAccessoryViewButtonItem.swift in Sources */,
63B213282CCA796D00A466DB /* NativeErrorPageAction.swift in Sources */,
211F00AC27F4D918001D9189 /* HistoryPanel+Search.swift in Sources */,
Expand Down Expand Up @@ -19003,7 +18978,6 @@
D04D1B92209790B60074B35F /* Toast.swift in Sources */,
8A93F87429D3A5C1004159D9 /* LaunchCoordinator.swift in Sources */,
C2D71B952A384F11003DEC7A /* ThemedTableViewCell.swift in Sources */,
219A0FD72ACC8C03009A6D1A /* InactiveTabsHeaderView.swift in Sources */,
8A5D1CBF2A30DC75005AD35C /* SyncNowSetting.swift in Sources */,
210E0EB8298D9D4500BB4F33 /* SearchEngineProvider.swift in Sources */,
21618A612A4201E500A5189E /* ThemeSettingsController.swift in Sources */,
Expand Down Expand Up @@ -19283,7 +19257,6 @@
2191D4472DC3BC1200E1A839 /* ZoomTelemetry.swift in Sources */,
0A76936B2C82018700103A6D /* TrackingProtectionBlockedTrackersView.swift in Sources */,
E1463D022981DA190074E16E /* NotificationManager.swift in Sources */,
219A0FD92ACC8C0F009A6D1A /* InactiveTabsFooterView.swift in Sources */,
884CA7492344A301002E4711 /* TextContentDetector.swift in Sources */,
8A9F0B5627C595F300FE09AE /* ImageIdentifiers.swift in Sources */,
43A5643823CD1E1C00B6857D /* UpdateViewController.swift in Sources */,
Expand Down Expand Up @@ -19325,7 +19298,6 @@
0BDDB3462CA6E43A00D501DF /* BookmarksSaver.swift in Sources */,
EBB89506219398E500EB91A0 /* TabContentBlocker.swift in Sources */,
E1B9A2C22CAD91EF00F6A0E9 /* ToolbarTelemetry.swift in Sources */,
21F2A2D22B0BC85200626AEC /* InactiveTabsModel.swift in Sources */,
D3E8EF101B97BE69001900FB /* ClearPrivateDataTableViewController.swift in Sources */,
E11C0E3D2CEF328B00D884D3 /* TermsOfServiceManager.swift in Sources */,
C8F457AA1F1FDD9B000CB895 /* BrowserViewController+KeyCommands.swift in Sources */,
Expand Down
10 changes: 0 additions & 10 deletions firefox-ios/Client/Application/AccessibilityIdentifiers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,15 +317,6 @@ struct AccessibilityIdentifiers {
static let tabCell = "TabDisplayView.tabCell"
static let closeButton = "tabCloseButton"
static let tabsTray = "Tabs Tray"

struct InactiveTabs {
static let headerLabel = "InactiveTabs.headerLabel"
static let headerButton = "InactiveTabs.headerButton"
static let headerView = "InactiveTabs.header"
static let cellLabel = "InactiveTabs.cell.label"
static let footerView = "InactiveTabs.footer"
static let deleteButton = "InactiveTabs.deleteButton"
}
}

struct LibraryPanels {
Expand Down Expand Up @@ -692,7 +683,6 @@ struct AccessibilityIdentifiers {
static let title = "BrowsingSettings"
static let tabs = "TABS"
static let links = "LINKS"
static let inactiveTabsSwitch = "Inactive Tabs"
static let blockPopUps = "blockPopups"
static let autoPlay = "AutoplaySettings"
static let blockImages = "NoImageModeStatus"
Expand Down
16 changes: 0 additions & 16 deletions firefox-ios/Client/Frontend/Browser/Tabs/Action/TabPanelAction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/

import Redux
import Common

Expand All @@ -22,7 +18,6 @@ struct TabPanelViewAction: Action {
let moveTabData: MoveTabData?
let toastType: ToastType?
let shareSheetURL: URL?
let isInactiveTab: Bool?
let deleteTabPeriod: TabsDeletionPeriod?

init(panelType: TabTrayPanelType?,
Expand All @@ -33,7 +28,6 @@ struct TabPanelViewAction: Action {
moveTabData: MoveTabData? = nil,
toastType: ToastType? = nil,
shareSheetURL: URL? = nil,
isInactiveTab: Bool? = nil,
deleteTabPeriod: TabsDeletionPeriod? = nil,
windowUUID: WindowUUID,
actionType: ActionType) {
Expand All @@ -47,7 +41,6 @@ struct TabPanelViewAction: Action {
self.moveTabData = moveTabData
self.toastType = toastType
self.shareSheetURL = shareSheetURL
self.isInactiveTab = isInactiveTab
self.deleteTabPeriod = deleteTabPeriod
}
}
Expand All @@ -65,11 +58,6 @@ enum TabPanelViewActionType: ActionType {
case deleteTabsOlderThan
case undoCloseAllTabs
case moveTab
case toggleInactiveTabs
case closeInactiveTab
case undoCloseInactiveTab
case closeAllInactiveTabs
case undoCloseAllInactiveTabs
case learnMorePrivateMode
case selectTab
}
Expand All @@ -78,20 +66,17 @@ struct TabPanelMiddlewareAction: Action {
let windowUUID: WindowUUID
let actionType: ActionType
let tabDisplayModel: TabDisplayModel?
let inactiveTabModels: [InactiveTabsModel]?
let toastType: ToastType??
let scrollBehavior: TabScrollBehavior?

init(tabDisplayModel: TabDisplayModel? = nil,
inactiveTabModels: [InactiveTabsModel]? = nil,
toastType: ToastType? = nil,
scrollBehavior: TabScrollBehavior? = nil,
windowUUID: WindowUUID,
actionType: ActionType) {
self.windowUUID = windowUUID
self.actionType = actionType
self.tabDisplayModel = tabDisplayModel
self.inactiveTabModels = inactiveTabModels
self.toastType = toastType
self.scrollBehavior = scrollBehavior
}
Expand All @@ -102,7 +87,6 @@ enum TabPanelMiddlewareActionType: ActionType {
case willAppearTabPanel
case didChangeTabPanel
case refreshTabs
case refreshInactiveTabs
case showToast
case scrollToTab
}
Expand Down
58 changes: 0 additions & 58 deletions firefox-ios/Client/Frontend/Browser/Tabs/LayoutManager/InactiveTabsSectionManager.swift
View file
Open in desktop

This file was deleted.

Loading