Bug 1878401 - part 3 - Update nsIFilePicker users in toolkit/ to pass…

… BrowsingContext to init r=extension-reviewers,Gijs,ng,robwu Depends on D200547 Differential Revision: https://phabricator.services.mozilla.com/D200548
dothq · Feb 28, 2024 · 37e8e74 · 37e8e74
1 parent 2783888
commit 37e8e74
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 11 deletions.
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js
@@ -2469,7 +2469,11 @@ function saveReportsToFile() {
   };
 
   try {
-    fp.init(window, "Save Memory Reports", Ci.nsIFilePicker.modeSave);
+    fp.init(
+      window.browsingContext,
+      "Save Memory Reports",
+      Ci.nsIFilePicker.modeSave
+    );
   } catch (ex) {
     // This will fail on Android, since there is no Save as file picker there.
     // Just save to the default downloads dir if it does.

diff --git a/toolkit/components/apppicker/content/appPicker.js b/toolkit/components/apppicker/content/appPicker.js
@@ -195,7 +195,11 @@ AppPicker.prototype = {
     var nsIFilePicker = Ci.nsIFilePicker;
     var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
 
-    fp.init(window, this._incomingParams.title, nsIFilePicker.modeOpen);
+    fp.init(
+      window.browsingContext,
+      this._incomingParams.title,
+      nsIFilePicker.modeOpen
+    );
     fp.appendFilters(nsIFilePicker.filterApps);
 
     var startLocation;

diff --git a/toolkit/components/extensions/parent/ext-downloads.js b/toolkit/components/extensions/parent/ext-downloads.js
@@ -941,7 +941,11 @@ this.downloads = class extends ExtensionAPIPersistent {
             const picker = Cc["@mozilla.org/filepicker;1"].createInstance(
               Ci.nsIFilePicker
             );
-            picker.init(window, null, Ci.nsIFilePicker.modeSave);
+            picker.init(
+              window.browsingContext,
+              null,
+              Ci.nsIFilePicker.modeSave
+            );
             if (lastFilePickerDirectory) {
               picker.displayDirectory = lastFilePickerDirectory;
             } else {

diff --git a/toolkit/components/printing/content/print.js b/toolkit/components/printing/content/print.js
@@ -2811,7 +2811,7 @@ async function pickFileName(contentTitle, currentURI) {
   filename = DownloadPaths.sanitize(filename);
 
   picker.init(
-    window.docShell.chromeEventHandler.ownerGlobal,
+    window.docShell.chromeEventHandler.ownerGlobal.browsingContext,
     title,
     Ci.nsIFilePicker.modeSave
   );

diff --git a/toolkit/content/aboutwebrtc/aboutWebrtc.mjs b/toolkit/content/aboutwebrtc/aboutWebrtc.mjs
@@ -230,7 +230,7 @@ class SavePage extends Control {
     ]);
     let FilePicker = makeFilePickerService();
     const lazyFileUtils = lazy.FileUtils;
-    FilePicker.init(window, dialogTitle, FilePicker.modeSave);
+    FilePicker.init(window.browsingContext, dialogTitle, FilePicker.modeSave);
     FilePicker.defaultString = LOGFILE_NAME_DEFAULT;
     const rv = await new Promise(r => FilePicker.open(r));
     if (rv != FilePicker.returnOK && rv != FilePicker.returnReplace) {

diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js
@@ -688,7 +688,7 @@ function promiseTargetFile(
     let fp = makeFilePicker();
     let titleKey = aFpP.fpTitleKey || "SaveLinkTitle";
     fp.init(
-      window,
+      window.browsingContext,
       ContentAreaUtils.stringBundle.GetStringFromName(titleKey),
       Ci.nsIFilePicker.modeSave
     );

diff --git a/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs b/toolkit/mozapps/downloads/HelperAppDlg.sys.mjs
@@ -309,7 +309,7 @@ nsUnknownContentTypeDialog.prototype = {
       var picker =
         Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
       var windowTitle = bundle.GetStringFromName("saveDialogTitle");
-      picker.init(parent, windowTitle, nsIFilePicker.modeSave);
+      picker.init(parent.browsingContext, windowTitle, nsIFilePicker.modeSave);
       if (aDefaultFileName) {
         picker.defaultString = this.getFinalLeafName(aDefaultFileName);
       }
@@ -1270,7 +1270,7 @@ nsUnknownContentTypeDialog.prototype = {
       var nsIFilePicker = Ci.nsIFilePicker;
       var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
       fp.init(
-        this.mDialog,
+        this.mDialog.browsingContext,
         this.dialogElement("strings").getString("chooseAppFilePickerTitle"),
         nsIFilePicker.modeOpen
       );

diff --git a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js
@@ -237,7 +237,11 @@ async function installAddonsFromFilePicker() {
   ]);
   const nsIFilePicker = Ci.nsIFilePicker;
   var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
-  fp.init(window, dialogTitle.value, nsIFilePicker.modeOpenMultiple);
+  fp.init(
+    window.browsingContext,
+    dialogTitle.value,
+    nsIFilePicker.modeOpenMultiple
+  );
   try {
     fp.appendFilter(filterName.value, "*.xpi;*.jar;*.zip");
     fp.appendFilters(nsIFilePicker.filterAll);

diff --git a/toolkit/mozapps/handling/content/appChooser.js b/toolkit/mozapps/handling/content/appChooser.js
@@ -225,7 +225,7 @@ let dialog = {
     let title = await this.getChooseAppWindowTitle();
 
     var fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-    fp.init(window, title, Ci.nsIFilePicker.modeOpen);
+    fp.init(window.browsingContext, title, Ci.nsIFilePicker.modeOpen);
     fp.appendFilters(Ci.nsIFilePicker.filterApps);
 
     fp.open(rv => {

diff --git a/toolkit/profile/content/createProfileWizard.js b/toolkit/profile/content/createProfileWizard.js
@@ -127,7 +127,7 @@ function chooseProfileFolder() {
     I.nsIFilePicker
   );
   dirChooser.init(
-    window,
+    window.browsingContext,
     gProfileManagerBundle.getString("chooseFolder"),
     I.nsIFilePicker.modeGetFolder
   );