Backing out 6cc523f2491e and 4e916c8dfe5d because they broken search buttons, r=me
authorMark Finkle <mfinkle@mozilla.com>
Wed, 16 Sep 2009 15:23:17 -0400
changeset 65567 764adac5bae4fb4a6f0438b3367fd0a1850a5821
parent 65566 3d2d300fe7713808e481d1c7846a224429958c3b
child 65568 2cabffd9a78816a32d01c18ce64beb778b6ac994
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
Backing out 6cc523f2491e and 4e916c8dfe5d because they broken search buttons, r=me
mobile/chrome/content/browser-ui.js
mobile/chrome/content/browser.js
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -173,25 +173,19 @@ var BrowserUI = {
     browser.mIconURL = faviconURI.spec;
 
     fis.setAndLoadFaviconForPage(browser.currentURI, faviconURI, true);
     this._favicon.src = faviconURI.spec;
   },
 
   showToolbar : function showToolbar(aEdit) {
     this.hidePanel();
-    if (this.isToolbarOpen())
-      return;
     this._editToolbar(aEdit);
   },
 
-  isToolbarOpen: function isToolbarOpen() {
-    return this._edit.popup.popupOpen;
-  },
-
   _toolbarLocked: 0,
   lockToolbar: function lockToolbar() {
     this._toolbarLocked++;
     document.getElementById("toolbar-moveable-container").top = "0";
   },
   
   unlockToolbar: function unlockToolbar() {
     if (!this._toolbarLocked)
@@ -498,18 +492,16 @@ var BrowserUI = {
   },
 
   search : function() {
     var queryURI = "http://www.google.com/search?q=" + this._edit.value + "&hl=en&lr=&btnG=Search";
     getBrowser().loadURI(queryURI, null, null, false);
   },
 
   showAutoComplete : function(showDefault) {
-    if (this.isToolbarOpen())
-      return;
     BrowserSearch.updateSearchButtons();
     this._edit.showHistoryPopup();
   },
 
   doButtonSearch : function(button) {
     if (!("engine" in button) || !button.engine)
       return;
 
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -2268,17 +2268,17 @@ ProgressController.prototype = {
 
     this._tab.updateThumbnail();
   },
 
   _documentStop: function() {
     // translate any phone numbers
     Browser.translatePhoneNumbers();
 
-    if (this._tab == Browser.selectedTab && !BrowserUI.isToolbarOpen()) {
+    if (this._tab == Browser.selectedTab) {
       // focus the dom window
       if (this.browser.currentURI.spec != "about:blank")
         this.browser.contentWindow.focus();
     }
   }
 };