corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1945868: Fix creating a new profile from the profile downgrade screen. r=jhirsch,profiles-reviewers

Browse Source 
We no longer need to gate including the sync description on whether sync is supported by the application or not because the string no longer includes the sync brand. This just uses the status of sync to control whether we ever see the sync specific string.

Differential Revision: https://phabricator.services.mozilla.com/D238058
This commit is contained in:
Dave Townsend
2025-02-14 10:32:40 +00:00
parent 8626e0a42f
commit 446c806f4e
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
toolkit/profile/content/profileDowngrade.js
View File

@@ -17,12 +17,12 @@ function init() {
* 1: A return argument, one of nsIToolkitProfileService.downgradeUIChoice.
*/
gParams = window.arguments[0].QueryInterface(Ci.nsIDialogParamBlock);
if (AppConstants.MOZ_SERVICES_SYNC) {
let hasSync = gParams.GetInt(0) & Ci.nsIToolkitProfileService.hasSync;
let hasSync =
AppConstants.MOZ_SERVICES_SYNC &&
gParams.GetInt(0) & Ci.nsIToolkitProfileService.hasSync;
document.getElementById("sync").hidden = !hasSync;
document.getElementById("nosync").hidden = hasSync;
}
document.getElementById("sync").hidden = !hasSync;
document.getElementById("nosync").hidden = hasSync;
document.addEventListener("dialogextra1", createProfile);
document.addEventListener("dialogaccept", quit);

6
toolkit/profile/content/profileDowngrade.xhtml
View File

@@ -31,10 +31,8 @@
<hbox flex="1" align="start">
<image id="info" role="presentation"/>
<vbox flex="1">
<description data-l10n-id="profiledowngrade-nosync"></description>
#ifdef MOZ_SERVICES_SYNC
<description data-l10n-id="profiledowngrade-sync2"></description>
#endif
<description id="nosync" data-l10n-id="profiledowngrade-nosync"></description>
<description id="sync" data-l10n-id="profiledowngrade-sync2"></description>
</vbox>
</hbox>

2
toolkit/profile/jar.mn
View File

@@ -9,5 +9,5 @@ toolkit.jar:
content/mozapps/profile/profileSelection.xhtml (content/profileSelection.xhtml)
#ifdef MOZ_BLOCK_PROFILE_DOWNGRADE
content/mozapps/profile/profileDowngrade.js (content/profileDowngrade.js)
* content/mozapps/profile/profileDowngrade.xhtml (content/profileDowngrade.xhtml)
content/mozapps/profile/profileDowngrade.xhtml (content/profileDowngrade.xhtml)
#endif