summaryrefslogtreecommitdiffstats
path: root/toolkit/components
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-06-28 15:50:23 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-06-28 15:50:23 -0400
commit7664308ab16560fc25622ef68810300233d39fa9 (patch)
treeb26a7dc3a9490a10ada2f544327196ed887b472e /toolkit/components
parentddea4710991d889a1c049835442a15fed026de9e (diff)
downloadUXP-7664308ab16560fc25622ef68810300233d39fa9.tar
UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.gz
UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.lz
UXP-7664308ab16560fc25622ef68810300233d39fa9.tar.xz
UXP-7664308ab16560fc25622ef68810300233d39fa9.zip
Add HYPE_ICEWEASEL where appropriate
Diffstat (limited to 'toolkit/components')
-rw-r--r--toolkit/components/passwordmgr/content/passwordManager.js4
-rw-r--r--toolkit/components/passwordmgr/content/passwordManager.xul4
2 files changed, 6 insertions, 2 deletions
diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js
index bd5cebfc4..327ebbdf8 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@@ -727,10 +727,12 @@ function escapeKeyHandler() {
window.close();
}
-#if defined(MC_BASILISK) && defined(XP_WIN)
+#ifdef XP_WIN
+#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
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
+#endif
diff --git a/toolkit/components/passwordmgr/content/passwordManager.xul b/toolkit/components/passwordmgr/content/passwordManager.xul
index c0a10bf8e..8590d96ac 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.xul
+++ b/toolkit/components/passwordmgr/content/passwordManager.xul
@@ -112,11 +112,13 @@
<button id="removeAllSignons" icon="clear"
oncommand="DeleteAllSignons();"/>
<spacer flex="1"/>
-#if defined(MC_BASILISK) && defined(XP_WIN)
+#ifdef XP_WIN
+#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
<button accesskey="&import.accesskey;"
label="&import.label;"
oncommand="OpenMigrator();"/>
#endif
+#endif
<button id="togglePasswords"
oncommand="TogglePasswordVisible();"/>
</hbox>