Skip to content

Commit 2783888

Browse files
committed
Bug 1878401 - part 2 - Update nsIFilePicker users in browser/ to pass BrowsingContext to init r=extension-reviewers,settings-reviewers,credential-management-reviewers,Gijs,sgalich,migration-reviewers,mconley,robwu
Depends on D200546 Differential Revision: https://phabricator.services.mozilla.com/D200547
1 parent 91cace0 commit 2783888

File tree

10 files changed

+30
-19
lines changed

10 files changed

+30
-19
lines changed

browser/base/content/browser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3039,7 +3039,7 @@ function BrowserOpenFileWindow() {
30393039
};
30403040

30413041
fp.init(
3042-
window,
3042+
window.browsingContext,
30433043
gNavigatorBundle.getString("openFile"),
30443044
nsIFilePicker.modeOpen
30453045
);

browser/base/content/pageinfo/pageInfo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ async function selectSaveFolder(aCallback) {
686686
}
687687
};
688688

689-
fp.init(window, titleText, nsIFilePicker.modeGetFolder);
689+
fp.init(window.browsingContext, titleText, nsIFilePicker.modeGetFolder);
690690
fp.appendFilters(nsIFilePicker.filterAll);
691691
try {
692692
let initialDir = Services.prefs.getComplexValue(

browser/components/aboutlogins/AboutLoginsParent.sys.mjs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ export class AboutLoginsParent extends JSWindowActorParent {
442442
},
443443
]);
444444

445-
fp.init(this.#ownerGlobal, title, Ci.nsIFilePicker.modeSave);
445+
fp.init(this.browsingContext, title, Ci.nsIFilePicker.modeSave);
446446
fp.appendFilter(csvFilterTitle, "*.csv");
447447
fp.appendFilters(Ci.nsIFilePicker.filterAll);
448448
fp.defaultString = defaultFilename;
@@ -479,8 +479,7 @@ export class AboutLoginsParent extends JSWindowActorParent {
479479
title: tsvFilterTitle,
480480
extensionPattern: "*.tsv",
481481
},
482-
],
483-
this.#ownerGlobal
482+
]
484483
);
485484

486485
if (result != Ci.nsIFilePicker.returnCancel) {
@@ -526,10 +525,10 @@ export class AboutLoginsParent extends JSWindowActorParent {
526525
this.sendAsyncMessage("AboutLogins:ShowLoginItemError", messageObject);
527526
}
528527

529-
async openFilePickerDialog(title, okButtonLabel, appendFilters, ownerGlobal) {
528+
async openFilePickerDialog(title, okButtonLabel, appendFilters) {
530529
return new Promise(resolve => {
531530
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
532-
fp.init(ownerGlobal, title, Ci.nsIFilePicker.modeOpen);
531+
fp.init(this.browsingContext, title, Ci.nsIFilePicker.modeOpen);
533532
for (const appendFilter of appendFilters) {
534533
fp.appendFilter(appendFilter.title, appendFilter.extensionPattern);
535534
}

browser/components/extensions/parent/ext-tabs.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,11 @@ this.tabs = class extends ExtensionAPIPersistent {
13641364
}
13651365
filename = DownloadPaths.sanitize(filename);
13661366

1367-
picker.init(activeTab.ownerGlobal, title, Ci.nsIFilePicker.modeSave);
1367+
picker.init(
1368+
activeTab.ownerGlobal.browsingContext,
1369+
title,
1370+
Ci.nsIFilePicker.modeSave
1371+
);
13681372
picker.appendFilter("PDF", "*.pdf");
13691373
picker.defaultExtension = "pdf";
13701374
picker.defaultString = filename;

browser/components/migration/ChromeProfileMigrator.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export class ChromeProfileMigrator extends MigratorBase {
140140
// to Chrome's local state directory.
141141
while (!(await this.hasPermissions())) {
142142
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
143-
fp.init(win, "", Ci.nsIFilePicker.modeGetFolder);
143+
fp.init(win?.browsingContext, "", Ci.nsIFilePicker.modeGetFolder);
144144
fp.filterIndex = 1;
145145
// Now wait for the filepicker to open and close. If the user picks
146146
// the local state folder, the OS should grant us read access to everything

browser/components/migration/MigrationWizardParent.sys.mjs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,11 @@ export class MigrationWizardParent extends JSWindowActorParent {
219219

220220
let { result, path } = await new Promise(resolve => {
221221
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
222-
fp.init(window, filePickerConfig.title, Ci.nsIFilePicker.modeOpen);
222+
fp.init(
223+
window.browsingContext,
224+
filePickerConfig.title,
225+
Ci.nsIFilePicker.modeOpen
226+
);
223227

224228
for (let filter of filePickerConfig.filters) {
225229
fp.appendFilter(filter.title, filter.extensionPattern);
@@ -299,7 +303,11 @@ export class MigrationWizardParent extends JSWindowActorParent {
299303

300304
let { result, path } = await new Promise(resolve => {
301305
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
302-
fp.init(window, filePickerConfig.title, Ci.nsIFilePicker.modeOpen);
306+
fp.init(
307+
window.browsingContext,
308+
filePickerConfig.title,
309+
Ci.nsIFilePicker.modeOpen
310+
);
303311

304312
for (let filter of filePickerConfig.filters) {
305313
fp.appendFilter(filter.title, filter.extensionPattern);

browser/components/migration/SafariProfileMigrator.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ export class SafariProfileMigrator extends MigratorBase {
632632
while (!(await this.hasPermissions())) {
633633
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
634634
// The title (second arg) is not displayed on macOS, so leave it blank.
635-
fp.init(win, "", Ci.nsIFilePicker.modeGetFolder);
635+
fp.init(win?.browsingContext, "", Ci.nsIFilePicker.modeGetFolder);
636636
fp.filterIndex = 1;
637637
fp.displayDirectory = FileUtils.getDir("ULibDir", [""]);
638638
// Now wait for the filepicker to open and close. If the user picks

browser/components/places/content/places.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ var PlacesOrganizer = {
500500
};
501501

502502
fp.init(
503-
window,
503+
window.browsingContext,
504504
PlacesUIUtils.promptLocalization.formatValueSync(
505505
"places-bookmarks-import"
506506
),
@@ -525,7 +525,7 @@ var PlacesOrganizer = {
525525
};
526526

527527
fp.init(
528-
window,
528+
window.browsingContext,
529529
PlacesUIUtils.promptLocalization.formatValueSync(
530530
"places-bookmarks-export"
531531
),
@@ -638,7 +638,7 @@ var PlacesOrganizer = {
638638
"places-bookmarks-restore-title",
639639
"places-bookmarks-restore-filter-name",
640640
]);
641-
fp.init(window, title, Ci.nsIFilePicker.modeOpen);
641+
fp.init(window.browsingContext, title, Ci.nsIFilePicker.modeOpen);
642642
fp.appendFilter(filterName, RESTORE_FILEPICKER_FILTER_EXT);
643643
fp.appendFilters(Ci.nsIFilePicker.filterAll);
644644
fp.displayDirectory = backupsDir;
@@ -711,7 +711,7 @@ var PlacesOrganizer = {
711711
"places-bookmarks-backup-title",
712712
"places-bookmarks-restore-filter-name",
713713
]);
714-
fp.init(window, title, Ci.nsIFilePicker.modeSave);
714+
fp.init(window.browsingContext, title, Ci.nsIFilePicker.modeSave);
715715
fp.appendFilter(filterName, RESTORE_FILEPICKER_FILTER_EXT);
716716
fp.defaultString = PlacesBackups.getFilenameForDate();
717717
fp.defaultExtension = "json";

browser/components/preferences/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3333,7 +3333,7 @@ var gMainPane = {
33333333

33343334
// Prompt the user to pick an app. If they pick one, and it's a valid
33353335
// selection, then add it to the list of possible handlers.
3336-
fp.init(window, winTitle, Ci.nsIFilePicker.modeOpen);
3336+
fp.init(window.browsingContext, winTitle, Ci.nsIFilePicker.modeOpen);
33373337
fp.appendFilters(Ci.nsIFilePicker.filterApps);
33383338
fp.open(fpCallback);
33393339
}
@@ -3451,7 +3451,7 @@ var gMainPane = {
34513451
let defDownloads = await this._indexToFolder(1);
34523452
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
34533453

3454-
fp.init(window, title, Ci.nsIFilePicker.modeGetFolder);
3454+
fp.init(window.browsingContext, title, Ci.nsIFilePicker.modeGetFolder);
34553455
fp.appendFilters(Ci.nsIFilePicker.filterAll);
34563456
// First try to open what's currently configured
34573457
if (currentDirPref && currentDirPref.exists()) {

browser/components/screenshots/fileHelpers.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ function promiseTargetFile(aFpP, win) {
238238
let fp = makeFilePicker();
239239
let titleKey = aFpP.fpTitleKey;
240240
fp.init(
241-
win,
241+
win.browsingContext,
242242
ContentAreaUtils.stringBundle.GetStringFromName(titleKey),
243243
Ci.nsIFilePicker.modeSave
244244
);

0 commit comments

Comments
 (0)