Skip to content
Snippets Groups Projects
Commit eff36028 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern: Committed by Beatriz Rizental
Browse files

BB 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 e1727956
Branches
Tags
1 merge request!1507Rebase Tor Browser onto 136.0a1
......@@ -340,6 +340,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