Closed Bug 1434046 Opened 3 years ago Closed 3 years ago

Inline software update XUL overlay

Categories

(Toolkit :: Application Update, enhancement)

enhancement
Not set
normal

Tracking

()

RESOLVED FIXED
mozilla60
Tracking Status
firefox60 --- fixed

People

(Reporter: bdahl, Assigned: bdahl)

References

Details

Attachments

(1 file)

It appears softwareUpdateOverlay.xul is only used in one place and should be inlined into the master document update.xul.
Assignee: nobody → bdahl
Comment on attachment 8946851 [details]
Bug 1434046 - Inline software update overlay in to master document.

https://reviewboard.mozilla.org/r/216740/#review222588

It appears that instantbird also overlays this file so please open an instantbird bug
https://dxr.mozilla.org/comm-central/source/im/content/jar.mn#11

::: toolkit/mozapps/update/content/updates.xul:19
(Diff revision 1)
>  %updateDTD;
>  %brandDTD;
>  ]>
>  
> +#ifdef XP_MACOSX
> +<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>

This is toolkit code and can't include files from browser (at least without other ifdef cobditions) since other apps use this file.

::: toolkit/mozapps/update/content/updates.xul:37
(Diff revision 1)
>  
>    <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
>    <script type="application/javascript" src="chrome://mozapps/content/update/updates.js"/>
>  
> +#ifdef XP_MACOSX
> +#include ../../../../browser/base/content/browserMountPoints.inc

This is toolkit code and can't include files from browser (at least without other ifdef cobditions) since other apps use this file. I think you can get away with copying the contents of browserMountPoints.inc here.

Note: This UI will no longer be used by Firefox hopefully sometime this year and sometime after that other apps will no longer use it as well.
Attachment #8946851 - Flags: review?(robert.strong.bugs) → review-
It might be easier to implement the few remaining uses of this file in the Firefox doorhanger where the other uses have been implemented and just remove the overlay.
I've filed bug 1434700 for instantbird.
Comment on attachment 8946851 [details]
Bug 1434046 - Inline software update overlay in to master document.

https://reviewboard.mozilla.org/r/216740/#review222868

Should be fine. I filed bug 1434780 to remove this when the remaining use cases are implemented outside of this UI.
Attachment #8946851 - Flags: review?(robert.strong.bugs) → review+
Pushed by bdahl@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/44411fc53d18
Inline software update overlay in to master document. r=rstrong
https://hg.mozilla.org/mozilla-central/rev/44411fc53d18
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla60
You need to log in before you can comment on or make changes to this bug.