wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1198525 - Fix about:rights in Nightly and Developer edition, r=mossop, r=mfinkle

Browse Source
This commit is contained in:
Justin Dolske 2015-09-14 13:43:51 +05:30
parent 2d54051153
commit e5f503f473
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/about/AboutRedirector.cpp
View File

@ -66,11 +66,7 @@ static RedirEntry kRedirMap[] = {
nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
nsIAboutModule::ALLOW_SCRIPT },
{ "rights",
#ifdef MOZ_OFFICIAL_BRANDING
"chrome://global/content/aboutRights.xhtml",
#else
"chrome://global/content/aboutRights-unbranded.xhtml",
#endif
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT },
{ "robots", "chrome://browser/content/aboutRobots.xhtml",

2
mobile/android/components/AboutRedirector.js
View File

@ -36,7 +36,7 @@ let modules = {
rights: {
uri: AppConstants.MOZ_OFFICIAL_BRANDING ?
"chrome://browser/content/aboutRights.xhtml" :
"chrome://global/content/aboutRights-unbranded.xhtml",
"chrome://global/content/aboutRights.xhtml",
privileged: false
},
blocked: {

7
toolkit/content/jar.mn
View File

@ -16,8 +16,11 @@ toolkit.jar:
content/global/about.xhtml (about.xhtml)
content/global/aboutAbout.js (aboutAbout.js)
content/global/aboutAbout.xhtml (aboutAbout.xhtml)
content/global/aboutRights.xhtml (aboutRights.xhtml)
content/global/aboutRights-unbranded.xhtml (aboutRights-unbranded.xhtml)
#ifdef MOZILLA_OFFICIAL
content/global/aboutRights.xhtml
#else
content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
#endif
content/global/aboutNetworking.js
content/global/aboutNetworking.xhtml
content/global/aboutServiceWorkers.js