Bug 557422 - Blank Page startup should not display the awesomebar screen [r=vingtetun]
authorMark Finkle <mfinkle@mozilla.com>
Tue, 06 Apr 2010 09:26:21 -0400
changeset 66105 e2781a302eaedf6cc974cd7afaf29905fd8100d2
parent 66104 cdba6f7557321a022ee785ecf710676d0ddfac05
child 66106 969f9b1d8b1d0d279d736748de32f7e5cc650218
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)
reviewersvingtetun
bugs557422
Bug 557422 - Blank Page startup should not display the awesomebar screen [r=vingtetun]
mobile/chrome/content/browser.js
mobile/chrome/content/preferences.js
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -501,20 +501,16 @@ var Browser = {
           whereURI = cmdLine.resolveURI(uriFlag);
           if (whereURI)
             whereURI = whereURI.spec;
         }
       } catch (e) {}
     }
 
     this.addTab(whereURI, true);
-    if (whereURI == "about:blank") {
-      BrowserUI.showToolbar(true);
-      BrowserUI.showAutoComplete();
-    }
 
     // JavaScript Error Console
     if (gPrefService.getBoolPref("browser.console.showInPanel")){
       let button = document.getElementById("tool-console");
       button.hidden = false;
     }
 
     bv.commitBatchOperation();
--- a/mobile/chrome/content/preferences.js
+++ b/mobile/chrome/content/preferences.js
@@ -271,17 +271,17 @@ var PreferencesView = {
     // Update the helper "Custom Page" item in the menulist
     if (value == "currentpage") {
       // If the helper item is not already in the list, we need to put it there
       // (this can happen when changing from one custom page to another)
       if (!helper)
         helper = options.appendItem(Elements.browserBundle.getString("homepage.custom2"), "custom");
 
       options.selectedItem = helper;
-    } else {
+    } else if (helper) {
       options.menupopup.removeChild(helper);
     }
 
     // Save the homepage URL to a preference
     let pls = Cc["@mozilla.org/pref-localizedstring;1"].createInstance(Ci.nsIPrefLocalizedString);
     pls.data = url;
     gPrefService.setComplexValue("browser.startup.homepage", Ci.nsIPrefLocalizedString, pls);