Backed out changeset 5b6fdfc822e9 (bug 661831) for browser_zbug569342.js failures.

browser/components/preferences/aboutPermissions.js

@@ -355,7 +355,6 @@ let AboutPermissions = {
    */
   _sites: {},
 
-  sitesFilter: null,
   sitesList: null,
   _selectedSite: null,
 
@@ -392,7 +391,6 @@ let AboutPermissions = {
    * Called on page load.
    */
   init: function() {
-    this.sitesFilter = document.getElementById("sites-filter");
     this.sitesList = document.getElementById("sites-list");
 
     this.getSitesFromPlaces();
@@ -622,7 +620,7 @@ let AboutPermissions = {
     aSite.listitem = item;
 
     // Make sure to only display relevant items when list is filtered
-    let filterValue = this.sitesFilter.value.toLowerCase();
+    let filterValue = document.getElementById("sites-filter").value.toLowerCase();
     item.collapsed = aSite.principal.origin.toLowerCase().indexOf(filterValue) == -1;
 
     (this._listFragment || this.sitesList).appendChild(item);
@@ -645,7 +643,7 @@ let AboutPermissions = {
    */
   filterSitesList: function() {
     let siteItems = this.sitesList.children;
-    let filterValue = this.sitesFilter.value.toLowerCase();
+    let filterValue = document.getElementById("sites-filter").value.toLowerCase();
 
     if (filterValue == "") {
       for (let i = 0; i < siteItems.length; i++) {
@@ -882,13 +880,6 @@ let AboutPermissions = {
       window.openDialog("chrome://browser/content/preferences/cookies.xul",
                         "Browser:Cookies", "", {filterString : selectedHost});
     }
-  },
-
-  /**
-   * Focusses the filter box.
-   */
-  focusFilterBox: function() {
-    this.sitesFilter.focus();
   }
 }
 

browser/components/preferences/aboutPermissions.xul

@@ -25,10 +25,6 @@
   <script type="application/javascript"
           src="chrome://browser/content/preferences/aboutPermissions.js"/>
 
-  <keyset>
-    <key key="&focusSearch.key;" modifiers="accel" oncommand="AboutPermissions.focusFilterBox();"/>
-  </keyset>
-
   <hbox flex="1" id="permissions-content" class="main-content">
 
     <vbox id="sites-box">

browser/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd

@@ -44,5 +44,3 @@
 <!ENTITY push.label                      "Receive Push Notifications">
 <!ENTITY camera.label                    "Use the Camera">
 <!ENTITY microphone.label                "Use the Microphone">
-
-<!ENTITY focusSearch.key                 "f">