Merge branch 'master' into mailnews-work

1 files changed, 0 insertions, 27 deletions

diff --git a/application/palemoon/components/preferences/security.js b/application/palemoon/components/preferences/security.js
index 9d5f302a2..54fab68ac 100644
--- a/application/palemoon/components/preferences/security.js
+++ b/application/palemoon/components/preferences/security.js
@@ -18,7 +18,6 @@ var gSecurityPane = {
   {
     this._pane = document.getElementById("paneSecurity");
     this._initMasterPasswordUI();
-    this._initHPKPUI();
   },
 
   // ADD-ONS
@@ -233,31 +232,5 @@ var gSecurityPane = {
     document.documentElement.openWindow("Toolkit:PasswordManager",
                                         "chrome://passwordmgr/content/passwordManager.xul",
                                         "", null);
-  },
-  
-  _initHPKPUI: function() {
-    let checkbox = document.getElementById("enableHPKP");
-    let HPKPpref = document.getElementById("security.cert_pinning.enforcement_level");
-
-    if (HPKPpref.value == 0) {
-      checkbox.checked = false;
-    } else {
-      checkbox.checked = true;
-    }
-  },
-      
-  /**
-   * Updates the HPKP enforcement level to the proper value depending on checkbox
-   * state.
-   */
-  updateHPKPPref: function() {
-    let checkbox = document.getElementById("enableHPKP");
-    let HPKPpref = document.getElementById("security.cert_pinning.enforcement_level");
-    
-    if (checkbox.checked) {
-      HPKPpref.value = 2;
-    } else {
-      HPKPpref.value = 0;
-    }
   }
 };