Backed out changeset 5c4677b1ea47 (bug 1820655) for causing failures at browser_open_migration_wizard.js. CLOSED TREE
This commit is contained in:
@@ -10,7 +10,6 @@
|
||||
|
||||
ChromeUtils.defineESModuleGetters(this, {
|
||||
BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.sys.mjs",
|
||||
MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs",
|
||||
});
|
||||
|
||||
// Constants & Enumeration Values
|
||||
@@ -473,11 +472,6 @@ var gMainPane = {
|
||||
"command",
|
||||
gMainPane.showContainerSettings
|
||||
);
|
||||
setEventListener(
|
||||
"data-migration",
|
||||
"command",
|
||||
gMainPane.onMigrationButtonCommand
|
||||
);
|
||||
|
||||
// For media control toggle button, we support it on Windows 8.1+ (NT6.3),
|
||||
// MacOs 10.4+ (darwin8.0, but we already don't support that) and
|
||||
@@ -1719,20 +1713,6 @@ var gMainPane = {
|
||||
})().catch(console.error);
|
||||
},
|
||||
|
||||
onMigrationButtonCommand(command) {
|
||||
// When browser.migrate.content-modal.enabled is enabled by default,
|
||||
// the event handler can just call showMigrationWizardDialog directly,
|
||||
// but for now, we delegate to MigrationUtils to open the native modal
|
||||
// in case that's the dialog we're still using.
|
||||
//
|
||||
// Enabling the pref by default will be part of bug 1822156.
|
||||
const browser = window.docShell.chromeEventHandler;
|
||||
const browserWindow = browser.ownerGlobal;
|
||||
MigrationUtils.showMigrationWizard(browserWindow, {
|
||||
entrypoint: MigrationUtils.MIGRATION_ENTRYPOINTS.PREFERENCES,
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* Displays the migration wizard dialog in an HTML dialog.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user