mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-07 20:39:59 +02:00
51 lines
2.3 KiB
C++
51 lines
2.3 KiB
C++
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
|
|
index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..dfacd5c40ef14319fe7398452c007f167003a583 100644
|
|
--- a/browser/base/content/browser.js
|
|
+++ b/browser/base/content/browser.js
|
|
@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
|
|
ContextualIdentityService:
|
|
"resource://gre/modules/ContextualIdentityService.sys.mjs",
|
|
CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
|
|
+ ZenCustomizableUI: "chrome://browser/content/ZenCustomizableUI.sys.mjs",
|
|
DevToolsSocketStatus:
|
|
"resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
|
|
DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
|
|
@@ -2340,6 +2341,10 @@ var XULBrowserWindow = {
|
|
AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
|
|
TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
|
|
|
|
+ gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
|
|
+ gZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
|
|
+ gZenPinnedTabManager.onLocationChange(gBrowser.selectedBrowser);
|
|
+
|
|
PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
|
|
|
|
if (!gMultiProcessBrowser) {
|
|
@@ -4816,7 +4821,7 @@ function switchToTabHavingURI(
|
|
ignoreQueryString || replaceQueryString,
|
|
ignoreFragmentWhenComparing
|
|
);
|
|
- let browsers = aWindow.gBrowser.browsers;
|
|
+ let browsers = aWindow.gZenWorkspaces.allUsedBrowsers;
|
|
for (let i = 0; i < browsers.length; i++) {
|
|
let browser = browsers[i];
|
|
let browserCompare = cleanURL(
|
|
@@ -4859,7 +4864,7 @@ function switchToTabHavingURI(
|
|
}
|
|
|
|
if (!doAdopt) {
|
|
- aWindow.gBrowser.tabContainer.selectedIndex = i;
|
|
+ aWindow.gZenWorkspaces.switchIfNeeded(browser, i);
|
|
}
|
|
|
|
return true;
|
|
@@ -5717,6 +5722,9 @@ var ConfirmationHint = {
|
|
MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
|
|
MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");
|
|
document.l10n.setAttributes(this._message, messageId, options.l10nArgs);
|
|
+ if (window.gZenUIManager?.showToast) {
|
|
+ return window.gZenUIManager.showToast(messageId, options);
|
|
+ }
|
|
if (options.descriptionId) {
|
|
document.l10n.setAttributes(this._description, options.descriptionId);
|
|
this._description.hidden = false;
|