Bug 1195060 - In the Add-ons manager, make Ctrl+f focus the search box again instead of invoking the findbar first. r=mossop

toolkit/mozapps/extensions/content/extensions.js

@@ -1970,18 +1970,6 @@ var gHeader = {
       this.focusSearchBox();
       return;
     }
-
-    // XXXunf Temporary until bug 371900 is fixed.
-    let key = document.getElementById("focusSearch").getAttribute("key");
-#ifdef XP_MACOSX
-    let keyModifier = aEvent.metaKey;
-#else
-    let keyModifier = aEvent.ctrlKey;
-#endif
-    if (String.fromCharCode(aEvent.charCode) == key && keyModifier) {
-      this.focusSearchBox();
-      return;
-    }
   },
 
   get shouldShowNavButtons() {

toolkit/mozapps/extensions/content/extensions.xul

@@ -78,7 +78,8 @@
   <!-- global commands - these act on all addons, or affect the addons manager
        in some other way -->
   <commandset id="globalCommandSet">
-    <command id="cmd_focusSearch"/>
+    <!-- XXXsw remove useless oncommand attribute once bug 371900 is fixed -->
+    <command id="cmd_focusSearch" oncommand=";"/>
     <command id="cmd_findAllUpdates"/>
     <command id="cmd_restartApp"/>
     <command id="cmd_goToDiscoverPane"/>
@@ -120,9 +121,8 @@
   </commandset>
 
   <keyset>
-    <!-- XXXunf Disabled until bug 371900 is fixed. -->
     <key id="focusSearch" key="&search.commandkey;" modifiers="accel"
-         disabled="true"/>
+         command="cmd_focusSearch"/>
   </keyset>
   <hbox flex="1">
     <vbox>

toolkit/mozapps/extensions/test/browser/browser-common.ini

@@ -16,7 +16,6 @@ skip-if = buildapp == 'mulet'
 [browser_bug567127.js]
 [browser_bug567137.js]
 [browser_bug570760.js]
-skip-if = e10s # Bug ?????? - EventUtils.synthesizeKey not e10s friendly
 [browser_bug572561.js]
 [browser_bug577990.js]
 [browser_bug580298.js]