Merge
authorBill McCloskey <wmccloskey@mozilla.com>
Fri, 27 Jan 2012 11:54:23 -0800
changeset 85605 840d3613b8d802c9b98031dcc2afe547bdb3d091
parent 85604 ff332e866e416734dee23306397f35ae012c76ad (current diff)
parent 85603 687b80084d3d3131ce45f06454cc12620db49bbf (diff)
child 85606 920e8c77c0424f541f8ade0ed2eecdd171067e80
push id21940
push userjdrew@mozilla.com
push dateSun, 29 Jan 2012 02:43:03 +0000
treeherdermozilla-central@ec666b4c8d84 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone12.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -302,26 +302,26 @@ var BrowserApp = {
         // Let the session make a restored tab active
         restoreToFront = true;
 
         // Be ready to handle any restore failures by making sure we have a valid tab opened
         let restoreCleanup = {
           observe: function(aSubject, aTopic, aData) {
             Services.obs.removeObserver(restoreCleanup, "sessionstore-windows-restored");
             if (aData == "fail")
-              BrowserApp.addTab("about:home", { showProgress: false });
+              BrowserApp.addTab("about:home");
           }
         };
         Services.obs.addObserver(restoreCleanup, "sessionstore-windows-restored", false);
       }
 
       // Start the restore
       ss.restoreLastSession(restoreToFront);
     } else {
-      this.addTab(url, { showProgress: url != "about:home" });
+      this.addTab(url);
 
       // show telemetry door hanger if we aren't restoring a session
       this._showTelemetryPrompt();
     }
 
     // notify java that gecko has loaded
     sendMessageToJava({
       gecko: {