diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-06-28 16:19:27 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-06-28 16:19:27 -0400 |
| commit | f47536f5706b036aa410636b74e1a96b1d58430a (patch) | |
| tree | 26c4cbe2254af17c16ba9fc38bde7870656db216 /toolkit/components/passwordmgr | |
| parent | ee4ef87724fda6c474e7e69b519acd58a574679d (diff) | |
| parent | 7664308ab16560fc25622ef68810300233d39fa9 (diff) | |
| download | UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.gz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.lz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.xz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.zip | |
Merge branch 'define-work'
Diffstat (limited to 'toolkit/components/passwordmgr')
| -rw-r--r-- | toolkit/components/passwordmgr/content/passwordManager.js | 4 | ||||
| -rw-r--r-- | toolkit/components/passwordmgr/content/passwordManager.xul | 4 |
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> |