Skip to content
Snippets Groups Projects
Commit 26ddbd4f authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

Bug 42438: Tweaks to the migration wizard.

Remove the items not compatible with our features (such as history) from
the migration wizard.

On Linux, allow to specify an alternative home directory, since we
usually change $HOME in our startup script.
parent 3090c755
Branches
Tags
1 merge request!1462BB/TB 43584: Rebased stable again onto 128.9.0esr build2
......@@ -342,6 +342,8 @@ export var ChromeMigrationUtils = {
if (rootDir == SNAP_REAL_HOME) {
targetPath = Services.env.get("SNAP_REAL_HOME");
} else if (rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME")) {
targetPath = Services.env.get("BB_ORIGINAL_HOME");
} else {
targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path;
}
......
......
......@@ -481,7 +481,10 @@ export class MigrationWizard extends HTMLElement {
}
let key = panelItem.getAttribute("key");
let resourceTypes = panelItem.resourceTypes;
const allowedTypes = ["BOOKMARKS"];
let resourceTypes = panelItem.resourceTypes.filter(t =>
allowedTypes.includes(t)
);
for (let child of this.#resourceTypeList.querySelectorAll(
"label[data-resource-type]"
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment