Bug 1198525 - Fix about:rights in Nightly and Developer edition, r=mossop, r=mfinkle
authorJustin Dolske <dolske@mozilla.com>
Mon, 14 Sep 2015 13:43:51 +0530
changeset 296570 a8a074a2ee8912b7aefd590956534ca0a7d44175
parent 296569 83d4e623d4762dc8ff5075d3a059de5ebdaab5d3
child 296571 6d3465f4aa24a2894c2d7f14d988fd5c4000a17e
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop, mfinkle
bugs1198525
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1198525 - Fix about:rights in Nightly and Developer edition, r=mossop, r=mfinkle
browser/components/about/AboutRedirector.cpp
mobile/android/components/AboutRedirector.js
toolkit/content/jar.mn
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -61,21 +61,17 @@ static RedirEntry kRedirMap[] = {
   { "feeds", "chrome://browser/content/feeds/subscribe.xhtml",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::ALLOW_SCRIPT |
     nsIAboutModule::HIDE_FROM_ABOUTABOUT },
   { "privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.xhtml",
     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",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::ALLOW_SCRIPT },
   { "sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
   { "welcomeback", "chrome://browser/content/aboutWelcomeBack.xhtml",
--- a/mobile/android/components/AboutRedirector.js
+++ b/mobile/android/components/AboutRedirector.js
@@ -31,17 +31,17 @@ let modules = {
     uri: "about:blank",
     privileged: false,
     hide: true
   },
 
   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: {
     uri: "chrome://browser/content/blockedSite.xhtml",
     privileged: false,
     hide: true
   },
   certerror: {
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -11,18 +11,21 @@ toolkit.jar:
 *  content/global/xul.css                     (xul.css)
    content/global/textbox.css                 (textbox.css)
    content/global/menulist.css                (menulist.css)
    content/global/autocomplete.css            (autocomplete.css)
    content/global/about.js                    (about.js)
    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
    content/global/aboutServiceWorkers.xhtml
    content/global/aboutwebrtc/aboutWebrtc.css   (aboutwebrtc/aboutWebrtc.css)
    content/global/aboutwebrtc/aboutWebrtc.js    (aboutwebrtc/aboutWebrtc.js)
    content/global/aboutwebrtc/aboutWebrtc.xhtml (aboutwebrtc/aboutWebrtc.xhtml)
 *  content/global/aboutSupport.js