Back out 52d001bbf7ff (Bug 690011) for failures in Android b-c (browser_find.js and others) on a CLOSED TREE

mobile/chrome/content/browser-ui.js

@@ -399,25 +399,14 @@ var BrowserUI = {
   },
 
   init: function() {
-    let edit = this._edit = document.getElementById("urlbar-edit");
+    this._edit = document.getElementById("urlbar-edit");
     this._title = document.getElementById("urlbar-title");
     this._throbber = document.getElementById("urlbar-throbber");
     this._favicon = document.getElementById("urlbar-favicon");
     this._favicon.addEventListener("error", this, false);
 
-    edit.addEventListener("click", this, false);
-
-    // Delay urlbar binding initialization until the user interact with it
-    function urlbarBindOnFocus() {
-      if (!edit.hasAttribute("delaybinding"))
-        return;
-
-      window.removeEventListener("mousedown", urlbarBindOnFocus, true);
-      window.removeEventListener("keydown", urlbarBindOnFocus, true);
-      edit.removeAttribute("delaybinding");
-    };
-    window.addEventListener("mousedown", urlbarBindOnFocus, true);
-    window.addEventListener("keydown", urlbarBindOnFocus, true);
+    this._edit.addEventListener("click", this, false);
+    this._edit.addEventListener("mousedown", this, false);
 
     window.addEventListener("NavigationPanelShown", this, false);
     window.addEventListener("NavigationPanelHidden", this, false);

mobile/chrome/content/browser.css

@@ -6,7 +6,7 @@ browser[remote="true"] {
   -moz-binding: url("chrome://browser/content/bindings/browser.xml#remote-browser");
 }
 
-#urlbar-edit:not([delaybinding]) {
+#urlbar-edit {
   -moz-binding: url("chrome://browser/content/bindings.xml#autocomplete-aligned");
 }
 

mobile/chrome/content/browser.xul

@@ -253,7 +253,6 @@
                              placeholder="&urlbar.emptytext;"
                              collapsed="true"
                              flex="1"
-                             delaybinding="true"
                              readonly="true"
                              ontextentered="BrowserUI.goToURI();"
                              clickSelectsAll="true"/>