Bug 890764 - Fix: nav bar should remain visible after a tab navigates. r=tabraldes

browser/metro/base/content/ContextUI.js

@@ -10,7 +10,7 @@ const kContextUIDismissEvent = "MozContextUIDismiss";
 const kContextUITabsShowEvent = "MozContextUITabsShow";
 // add more as needed...
 
-// delay for ContextUI's dismissWithDelay
+// delay for ContextUI's dismissTabsWithDelay
 const kHideContextAndTrayDelayMsec = 3000;
 
 // delay when showing the tab bar briefly as a new tab opens
@@ -163,25 +163,24 @@ var ContextUI = {
   peekTabs: function peekTabs() {
     if (this.tabbarVisible) {
       setTimeout(function () {
-        ContextUI.dismissWithDelay(kNewTabAnimationDelayMsec);
+        ContextUI.dismissTabsWithDelay(kNewTabAnimationDelayMsec);
       }, 0);
     } else {
       BrowserUI.setOnTabAnimationEnd(function () {
-        ContextUI.dismissWithDelay(kNewTabAnimationDelayMsec);
+        ContextUI.dismissTabsWithDelay(kNewTabAnimationDelayMsec);
       });
       this.displayTabs();
     }
   },
 
-
   /*
-   * Dismiss all context ui after a delay. Fires context ui events.
+   * Dismiss tab bar after a delay. Fires context ui events.
    */
-  dismissWithDelay: function dismissWithDelay(aDelay) {
+  dismissTabsWithDelay: function (aDelay) {
     aDelay = aDelay || kHideContextAndTrayDelayMsec;
     this._clearDelayedTimeout();
     this._hidingId = setTimeout(function () {
-        ContextUI.dismiss();
+        ContextUI.dismissTabs();
       }, aDelay);
   },
 
@@ -317,6 +316,9 @@ var ContextUI = {
         this.dismissTabs();
         break;
       case 'TabSelect':
+        this.dismissTabs();
+        break;
+
       case 'ToolPanelShown':
       case 'ToolPanelHidden':
       case "touchstart":

browser/metro/base/content/browser-ui.js

@@ -510,7 +510,7 @@ var BrowserUI = {
     this.setOnTabAnimationEnd(function() {
 	    Browser.closeTab(tabToClose, { forceClose: true } );
         if (wasCollapsed)
-          ContextUI.dismissWithDelay(kNewTabAnimationDelayMsec);
+          ContextUI.dismissTabsWithDelay(kNewTabAnimationDelayMsec);
     });
   },
 
@@ -552,7 +552,7 @@ var BrowserUI = {
 
   selectTabAndDismiss: function selectTabAndDismiss(aTab) {
     this.selectTab(aTab);
-    ContextUI.dismiss();
+    ContextUI.dismissTabs();
   },
 
   selectTabAtIndex: function selectTabAtIndex(aIndex) {
@@ -620,12 +620,6 @@ var BrowserUI = {
     return false;
   },
 
-  // If the user types in the address bar, cancel pending
-  // navbar autohide if set.
-  navEditKeyPress: function navEditKeyPress() {
-    ContextUI.cancelDismiss();
-  },
-
   observe: function BrowserUI_observe(aSubject, aTopic, aData) {
     switch (aTopic) {
       case "nsPref:changed":

browser/metro/base/content/browser.xul

@@ -290,7 +290,6 @@
                      flex="1"
                      onpaste="this.focus();"
                      ontextentered="BrowserUI.handleUrlbarEnter(param);"
-                     onkeydown="BrowserUI.navEditKeyPress();"
                      onblur="BrowserUI._urlbarBlurred();"/>
           </hbox>