Bug 832325 - Finish the initialization of nsSessionStartup correctly if permanent PB is turned on; r=ttaubert a=lsblakk
authorEhsan Akhgari <ehsan@mozilla.com>
Sat, 23 Feb 2013 01:45:37 -0500
changeset 132220 5ce84c1fcfc747d9d382be3c91bddcdc3eade69a
parent 132219 ffe9335853f8ae2f1d274b54d74962b69548d8c0
child 132221 00a6221b35af897d88863fc74d39a8be04618b2d
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersttaubert, lsblakk
bugs832325
milestone21.0a2
Bug 832325 - Finish the initialization of nsSessionStartup correctly if permanent PB is turned on; r=ttaubert a=lsblakk
browser/components/sessionstore/src/nsSessionStartup.js
--- a/browser/components/sessionstore/src/nsSessionStartup.js
+++ b/browser/components/sessionstore/src/nsSessionStartup.js
@@ -67,18 +67,21 @@ SessionStartup.prototype = {
 
 /* ........ Global Event Handlers .............. */
 
   /**
    * Initialize the component
    */
   init: function sss_init() {
     // do not need to initialize anything in auto-started private browsing sessions
-    if (PrivateBrowsingUtils.permanentPrivateBrowsing)
+    if (PrivateBrowsingUtils.permanentPrivateBrowsing) {
+      this._initialized = true;
+      gOnceInitializedDeferred.resolve();
       return;
+    }
 
     _SessionFile.read().then(
       this._onSessionFileRead.bind(this)
     );
   },
 
   // Wrap a string as a nsISupports
   _createSupportsString: function ssfi_createSupportsString(aData) {