Skip to content

feat: Add Air Traffic Control for automatic link routing to workspaces, b=no-bug, c=workspaces #9042

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
wants to merge 8 commits into
base: dev
Choose a base branch
from
+3,187 −9
Open

feat: Add Air Traffic Control for automatic link routing to workspaces, b=no-bug, c=workspaces #9042

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b8ca114
feat: Add Air Traffic Control for automatic link routing to workspace…
meenie Jun 16, 2025
f045568
Ran npm run pretty
meenie Jun 16, 2025
4a1216d
Address PR comments.
meenie Jun 16, 2025
8b7b2b4
Merge branch 'dev' into add-air-traffic-control
Jun 16, 2025
b254d71
Merge branch 'dev' into add-air-traffic-control
mr-cheffy Jun 19, 2025
89cbea8
Merge branch 'dev' into add-air-traffic-control
mr-cheffy Jun 20, 2025
df9949b
Merge branch 'dev' into add-air-traffic-control
mr-cheffy Jun 22, 2025
0edcdd0
Merge branch 'dev' into add-air-traffic-control
mr-cheffy Jun 24, 2025
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
2 changes: 2 additions & 0 deletions src/browser/base/content/zen-assets.jar.inc.mn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
content/browser/zen-styles/zen-gradient-generator.css (../../zen/workspaces/zen-gradient-generator.css)

content/browser/zen-components/ZenKeyboardShortcuts.mjs (../../zen/kbs/ZenKeyboardShortcuts.mjs)
content/browser/zen/modules/ZenAirTrafficControl.mjs (../../zen/modules/ZenAirTrafficControl.mjs)
content/browser/zen/modules/ZenAirTrafficControlIntegration.mjs (../../zen/modules/ZenAirTrafficControlIntegration.mjs)

content/browser/zen-components/ZenPinnedTabsStorage.mjs (../../zen/tabs/ZenPinnedTabsStorage.mjs)
content/browser/zen-components/ZenPinnedTabManager.mjs (../../zen/tabs/ZenPinnedTabManager.mjs)
Expand Down
5 changes: 3 additions & 2 deletions src/browser/components/preferences/jar-mn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
index 118709048e7de13f6ac10d0047e446b72303428f..c8cc2d7ee551b96be668a7844dab1db5abc9d684 100644
index 118709048e7de13f6ac10d0047e446b72303428f..1bed8626c2d7e1e08885a07aac777bec02f6e4dd 100644
--- a/browser/components/preferences/jar.mn
+++ b/browser/components/preferences/jar.mn
@@ -26,3 +26,5 @@ browser.jar:
@@ -26,3 +26,6 @@ browser.jar:
content/browser/preferences/widgets/setting-control.mjs (widgets/setting-control/setting-control.mjs)
content/browser/preferences/widgets/setting-group.mjs (widgets/setting-group/setting-group.mjs)
content/browser/preferences/widgets/setting-group.css (widgets/setting-group/setting-group.css)
+
+ content/browser/preferences/zen-settings.js
+ content/browser/preferences/zen-air-traffic-control.js
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we please have all these settings in the parent window as a dialog? Trying to avoid the preferences page as much as possible.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think a need a little bit more clarity. Where should I put the affordance that would open up the dialog? Do you have an example where you've already done this in Zen?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@meenie unfortunately, I can't think of an example where we are currently doing this on zen.

But it would ideally just be the same XHTML contents but instead of being in the settings, it's opened via https://searchfox.org/mozilla-central/source/browser/base/content/browser.js#5250.

One example of this modal is when pressing CMD+Q on mac

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya, for sure, makes sense. Just wondering where I should put the button to open it up? Should it be in a context menu somewhere? Or put a button in the preferences area that opens it up, kinda like how Arc does it themselves?
image

image

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe here? @marat0n

image

Also, please ping me so I can know you wrote me

Loading