Bug 1525834 - Port bug 1095602: Remove STATE_SECURE flags from nsIWebProgressListener in calendar/. r=philipp a=jorgk
authoraceman <acelists@atlas.sk>
Mon, 11 Feb 2019 15:38:47 +0100
changeset 34343 fbdbfa0e0fe3
parent 34342 0d11393715e4
child 34344 85ae1ae9eaa0
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersphilipp, jorgk
bugs1525834, 1095602
Bug 1525834 - Port bug 1095602: Remove STATE_SECURE flags from nsIWebProgressListener in calendar/. r=philipp a=jorgk
calendar/providers/gdata/content/browserRequest.css
calendar/providers/gdata/content/browserRequest.js
--- a/calendar/providers/gdata/content/browserRequest.css
+++ b/calendar/providers/gdata/content/browserRequest.css
@@ -4,18 +4,17 @@
 
 #security-button {
   width: 20px;
   margin-top: -1px;
   margin-right: 5px;
   background-repeat: no-repeat;
 }
 
-#security-button[level="high"],
-#security-button[level="low"] {
+#security-button[level="high"] {
   background-image: url("chrome://messenger/skin/icons/secure.png");
 }
 
 #security-button[level="broken"] {
   background-image: url("chrome://messenger/skin/icons/insecure.png");
 }
 
 #security-button[loading="true"] {
--- a/calendar/providers/gdata/content/browserRequest.js
+++ b/calendar/providers/gdata/content/browserRequest.js
@@ -38,31 +38,24 @@ var reporterListener = {
     },
 
     onStatusChange: function(aWebProgress, aRequest, aStatus, aMessage) {
     },
 
     onSecurityChange: function(aWebProgress, aRequest, aState) {
         const wpl_security_bits = wpl.STATE_IS_SECURE |
                                     wpl.STATE_IS_BROKEN |
-                                    wpl.STATE_IS_INSECURE |
-                                    wpl.STATE_SECURE_HIGH |
-                                    wpl.STATE_SECURE_MED |
-                                    wpl.STATE_SECURE_LOW;
+                                    wpl.STATE_IS_INSECURE;
         let browser = document.getElementById("requestFrame");
         let level;
 
         switch (aState & wpl_security_bits) {
-            case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
+            case wpl.STATE_IS_SECURE:
                 level = "high";
                 break;
-            case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_MED:
-            case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
-                level = "low";
-                break;
             case wpl.STATE_IS_BROKEN:
                 level = "broken";
                 break;
         }
         if (level) {
             this.securityButton.setAttribute("level", level);
             this.securityButton.hidden = false;
         } else {