Skip to content

Commit b8ca114

Browse files
committed
feat: Add Air Traffic Control for automatic link routing to workspaces, b=no-bug, c=workspaces
1 parent f240fab commit b8ca114

17 files changed

+3130
-9
lines changed

src/browser/base/content/zen-assets.jar.inc.mn

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
content/browser/zen-styles/zen-gradient-generator.css (../../zen/workspaces/zen-gradient-generator.css)
5353

5454
content/browser/zen-components/ZenKeyboardShortcuts.mjs (../../zen/kbs/ZenKeyboardShortcuts.mjs)
55+
content/browser/zen/modules/ZenAirTrafficControl.mjs (../../zen/modules/ZenAirTrafficControl.mjs)
56+
content/browser/zen/modules/ZenAirTrafficControlIntegration.mjs (../../zen/modules/ZenAirTrafficControlIntegration.mjs)
5557

5658
content/browser/zen-components/ZenPinnedTabsStorage.mjs (../../zen/tabs/ZenPinnedTabsStorage.mjs)
5759
content/browser/zen-components/ZenPinnedTabManager.mjs (../../zen/tabs/ZenPinnedTabManager.mjs)
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
2-
index 118709048e7de13f6ac10d0047e446b72303428f..c8cc2d7ee551b96be668a7844dab1db5abc9d684 100644
2+
index 118709048e7de13f6ac10d0047e446b72303428f..1bed8626c2d7e1e08885a07aac777bec02f6e4dd 100644
33
--- a/browser/components/preferences/jar.mn
44
+++ b/browser/components/preferences/jar.mn
5-
@@ -26,3 +26,5 @@ browser.jar:
5+
@@ -26,3 +26,6 @@ browser.jar:
66
content/browser/preferences/widgets/setting-control.mjs (widgets/setting-control/setting-control.mjs)
77
content/browser/preferences/widgets/setting-group.mjs (widgets/setting-group/setting-group.mjs)
88
content/browser/preferences/widgets/setting-group.css (widgets/setting-group/setting-group.css)
99
+
1010
+ content/browser/preferences/zen-settings.js
11+
+ content/browser/preferences/zen-air-traffic-control.js

0 commit comments

Comments
 (0)