tor-browser

commit c637943a81303282f79c9ba4f83651d8c7599440
parent e521365455a878ef008425578e2deeaba10b97ca
Author: Pier Angelo Vendrame <pierov@torproject.org>
Date:   Wed,  6 Mar 2024 10:09:06 +0100

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.

Diffstat:
M
browser/components/migration/ChromeMigrationUtils.sys.mjs
 | 
2
++
M
browser/components/migration/content/migration-wizard.mjs
 | 
5
++++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/browser/components/migration/ChromeMigrationUtils.sys.mjs b/browser/components/migration/ChromeMigrationUtils.sys.mjs
@@ -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;
         }
diff --git a/browser/components/migration/content/migration-wizard.mjs b/browser/components/migration/content/migration-wizard.mjs
@@ -510,7 +510,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]"