mirror of
https://github.com/zen-browser/desktop.git
synced 2026-07-31 04:08:53 +00:00
chore: Sync upstream Firefox to version 147.0, p=#11822
* chore: Sync upstream to `Firefox 147.0` * chore: Continued migration, b=no-bug, c=tests * chore: Finish migration without testing, b=no-bug, c=scripts, tabs, media, common, split-view * feat: Finish migration, b=no-bug, c=common, compact-mode, split-view, workspaces * feat: Finish basic migration, b=no-bug, c=kbs, common, folders * feat: Update surfer, b=no-bug, c=scripts
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
|
||||
index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d6e425bdf 100644
|
||||
index cfb6b8dd5443966d0635c3d7b477a68eca8fa9e0..c876890706b1a314c7760bbe1ff5e9eb57857e60 100644
|
||||
--- a/browser/base/content/browser-addons.js
|
||||
+++ b/browser/base/content/browser-addons.js
|
||||
@@ -1069,7 +1069,7 @@ var gXPInstallObserver = {
|
||||
@@ -20,7 +20,7 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d
|
||||
},
|
||||
};
|
||||
|
||||
@@ -2211,7 +2211,7 @@ var gUnifiedExtensions = {
|
||||
@@ -2212,7 +2212,7 @@ var gUnifiedExtensions = {
|
||||
// If the new ID is not added in NOTIFICATION_IDS, consider handling the case
|
||||
// in the "PopupNotificationsBeforeAnchor" handler elsewhere in this file.
|
||||
getPopupAnchorID(aBrowser, aWindow) {
|
||||
@@ -29,7 +29,7 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d
|
||||
const attr = anchorID + "popupnotificationanchor";
|
||||
|
||||
if (!aBrowser[attr]) {
|
||||
@@ -2222,7 +2222,7 @@ var gUnifiedExtensions = {
|
||||
@@ -2223,7 +2223,7 @@ var gUnifiedExtensions = {
|
||||
anchorID
|
||||
// Anchor on the toolbar icon to position the popup right below the
|
||||
// button.
|
||||
@@ -38,7 +38,7 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d
|
||||
}
|
||||
|
||||
return anchorID;
|
||||
@@ -2547,7 +2547,7 @@ var gUnifiedExtensions = {
|
||||
@@ -2548,7 +2548,7 @@ var gUnifiedExtensions = {
|
||||
requestAnimationFrame(() => this.updateAttention());
|
||||
},
|
||||
|
||||
@@ -47,7 +47,7 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d
|
||||
// A list of extension widget IDs (possibly empty).
|
||||
let widgetIDs;
|
||||
|
||||
@@ -2561,7 +2561,7 @@ var gUnifiedExtensions = {
|
||||
@@ -2562,7 +2562,7 @@ var gUnifiedExtensions = {
|
||||
}
|
||||
|
||||
// The list of overflowed extensions in the extensions panel.
|
||||
@@ -56,7 +56,7 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d
|
||||
"#overflowed-extensions-list"
|
||||
);
|
||||
|
||||
@@ -2662,37 +2662,41 @@ var gUnifiedExtensions = {
|
||||
@@ -2663,37 +2663,41 @@ var gUnifiedExtensions = {
|
||||
);
|
||||
template.replaceWith(template.content);
|
||||
this._panel = document.getElementById("unified-extensions-panel");
|
||||
@@ -123,7 +123,7 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d
|
||||
if (!CustomizationHandler.isCustomizing()) {
|
||||
if (aEvent) {
|
||||
if (
|
||||
@@ -2714,6 +2718,7 @@ var gUnifiedExtensions = {
|
||||
@@ -2715,6 +2719,7 @@ var gUnifiedExtensions = {
|
||||
// and no alternative content is available for display in the panel.
|
||||
const policies = this.getActivePolicies();
|
||||
if (
|
||||
@@ -131,7 +131,7 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d
|
||||
policies.length &&
|
||||
!this.hasExtensionsInPanel(policies) &&
|
||||
!this.isPrivateWindowMissingExtensionsWithoutPBMAccess() &&
|
||||
@@ -2729,32 +2734,30 @@ var gUnifiedExtensions = {
|
||||
@@ -2730,32 +2735,30 @@ var gUnifiedExtensions = {
|
||||
this.blocklistAttentionInfo =
|
||||
await AddonManager.getBlocklistAttentionInfo();
|
||||
|
||||
@@ -170,7 +170,7 @@ index fadcbfca95ee28140579430c0371baad0e2f216a..1947b4ab1c0b4ba0099147c9f13ae78d
|
||||
triggerEvent: aEvent,
|
||||
});
|
||||
}
|
||||
@@ -2941,18 +2944,20 @@ var gUnifiedExtensions = {
|
||||
@@ -2942,18 +2945,20 @@ var gUnifiedExtensions = {
|
||||
this._maybeMoveWidgetNodeBack(widgetId);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user