From 6386363f8966267d372d1382c7b27fbebb881c85 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Thu, 12 Apr 2018 13:39:45 -0400
Subject: Password Mananger has migration capabilities for only Basilisk

---
 toolkit/components/passwordmgr/content/passwordManager.js  | 2 ++
 toolkit/components/passwordmgr/content/passwordManager.xul | 2 +-
 toolkit/components/passwordmgr/jar.mn                      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js
index 333dc1d24..3fccb5d30 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@@ -721,8 +721,10 @@ function escapeKeyHandler() {
   window.close();
 }
 
+#if defined(MC_BASILISK) && defined(XP_WIN)
 function OpenMigrator() {
   const { MigrationUtils } = Cu.import("resource:///modules/MigrationUtils.jsm", {});
   // We pass in the type of source we're using for use in telemetry:
   MigrationUtils.showMigrationWizard(window, [MigrationUtils.MIGRATION_ENTRYPOINT_PASSWORDS]);
 }
+#endif
diff --git a/toolkit/components/passwordmgr/content/passwordManager.xul b/toolkit/components/passwordmgr/content/passwordManager.xul
index d248283b6..78dbd7ebc 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.xul
+++ b/toolkit/components/passwordmgr/content/passwordManager.xul
@@ -113,7 +113,7 @@
               label="&removeall.label;" accesskey="&removeall.accesskey;"
               oncommand="DeleteAllSignons();"/>
       <spacer flex="1"/>
-#if defined(MOZ_BUILD_APP_IS_BROWSER) && defined(XP_WIN)
+#if defined(MC_BASILISK) && defined(XP_WIN)
       <button accesskey="&import.accesskey;"
               label="&import.label;"
               oncommand="OpenMigrator();"/>
diff --git a/toolkit/components/passwordmgr/jar.mn b/toolkit/components/passwordmgr/jar.mn
index 9fa574e49..db6d7ffef 100644
--- a/toolkit/components/passwordmgr/jar.mn
+++ b/toolkit/components/passwordmgr/jar.mn
@@ -5,5 +5,5 @@
 toolkit.jar:
 %   content passwordmgr %content/passwordmgr/
 *   content/passwordmgr/passwordManager.xul            (content/passwordManager.xul)
-    content/passwordmgr/passwordManager.js             (content/passwordManager.js)
+*   content/passwordmgr/passwordManager.js             (content/passwordManager.js)
     content/passwordmgr/recipes.json                   (content/recipes.json)
-- 
cgit v1.2.3