Bug 553180 - remove Try Again button from CSP frame-ancestors error page, r=jst, ui-review=johnath
authorSid Stamm <sstamm@mozilla.com>
Wed, 09 Jun 2010 09:48:44 -0700
changeset 43403 b3ed3405f1dc327054d801bd6de93a674ad579b2
parent 43402 5eca1ddd02d62d345b78141213e8b2c905720e04
child 43404 d9dc260c1014c2161f8af8b54ff5e7a6323986c1
push id13685
push userbsterne@mozilla.com
push dateWed, 09 Jun 2010 16:50:57 +0000
treeherdermozilla-central@b3ed3405f1dc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs553180
milestone1.9.3a5pre
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 553180 - remove Try Again button from CSP frame-ancestors error page, r=jst, ui-review=johnath
docshell/resources/content/netError.xhtml
--- a/docshell/resources/content/netError.xhtml
+++ b/docshell/resources/content/netError.xhtml
@@ -178,17 +178,23 @@
           var faviconParent = favicon.parentNode;
           faviconParent.removeChild(favicon);
           favicon.setAttribute("href", "chrome://global/skin/icons/" + className + "_favicon.png");
           faviconParent.appendChild(favicon);
         }
         if (className == "expertBadCert") {
           showSecuritySection();
         }
-        
+
+        if (err == "cspFrameAncestorBlocked") {
+          // Remove the "Try again" button for CSP frame ancestors violation, since it's
+          // almost certainly useless. (Bug 553180)
+          document.getElementById("errorTryAgain").style.display = "none";
+        }
+
         if (err == "nssBadCert") {
           // Remove the "Try again" button for security exceptions, since it's
           // almost certainly useless.
           document.getElementById("errorTryAgain").style.display = "none";
           document.getElementById("errorPageContainer").setAttribute("class", "certerror");
           addDomainErrorLink();
         }
         else {