Bug 535104 - With the search bar removed from the toolbar, Ctrl+K still unhides the toolbar in full screen mode. r=rflint
authorDão Gottwald <dao@mozilla.com>
Wed, 16 Dec 2009 21:27:42 +0100
changeset 36296 8cd8049eabb0467ed50b9c717f68ccc78a1372d9
parent 36295 c1aaf10cf807884f43f73c95032673f948e62a60
child 36297 e303c71532e0924cedaab4923a7b5233919a16b5
push id10766
push userdgottwald@mozilla.com
push dateWed, 16 Dec 2009 20:28:18 +0000
treeherdermozilla-central@8cd8049eabb0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrflint
bugs535104
milestone1.9.3a1pre
Bug 535104 - With the search bar removed from the toolbar, Ctrl+K still unhides the toolbar in full screen mode. r=rflint
browser/base/content/browser.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3086,20 +3086,20 @@ const BrowserSearch = {
 
         win = window.openDialog("chrome://browser/content/", "_blank",
                                 "chrome,all,dialog=no", "about:blank");
         win.addEventListener("load", webSearchCallback, false);
       }
       return;
     }
 #endif
-    if (window.fullScreen)
+    var searchBar = this.searchBar;
+    if (searchBar && window.fullScreen)
       FullScreen.mouseoverToggle(true);
 
-    var searchBar = this.searchBar;
     if (isElementVisible(searchBar)) {
       searchBar.select();
       searchBar.focus();
     } else {
       var ss = Cc["@mozilla.org/browser/search-service;1"].
                getService(Ci.nsIBrowserSearchService);
       var searchForm = ss.defaultEngine.searchForm;
       openUILinkIn(searchForm, "current");