Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout changeset d927bdcfd2e4 (bug 795015) because of test failures

Browse Source
This commit is contained in:
Ehsan Akhgari 2012-09-28 16:55:22 -04:00
parent 9718200146
commit 84dd904b86
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
browser/components/privatebrowsing/src/nsPrivateBrowsingService.js
View File

@ -61,7 +61,7 @@ function PrivateBrowsingService() {
this._obs.addObserver(this, "private-browsing", true);
this._obs.addObserver(this, "command-line-startup", true);
this._obs.addObserver(this, "sessionstore-browser-state-restored", true);
this._obs.addObserver(this, "chrome-document-global-created", true);
this._obs.addObserver(this, "domwindowopened", true);
// List of nsIXULWindows we are going to be closing during the transition
this._windowsToClose = [];
@ -497,25 +497,17 @@ PrivateBrowsingService.prototype = {
this._notifyIfTransitionComplete();
}
break;
case "chrome-document-global-created":
case "domwindowopened":
let aWindow = aSubject;
let doc = aWindow.document;
let onLoad = function PBS__onWindowLoad(aEvent) {
if (aEvent) { // If being called from an event handler, aEvent will be non-null
aWindow.removeEventListener("load", onLoad);
let self = this;
aWindow.addEventListener("load", function PBS__onWindowLoad(aEvent) {
aWindow.removeEventListener("load", arguments.callee);
if (aWindow.document
.documentElement
.getAttribute("windowtype") == "navigator:browser") {
self._setPerWindowPBFlag(aWindow, self._inPrivateBrowsing);
}
if (doc.documentElement
.getAttribute("windowtype") == "navigator:browser") {
this._setPerWindowPBFlag(aWindow, this._inPrivateBrowsing);
}
}.bind(this);
// Make sure to catch any possible cases where the window's load event
// has already been fired by the time that we get here.
if (doc.readyState == "complete") {
onLoad(null);
} else {
aWindow.addEventListener("load", onLoad, false);
}
}, false);
break;
}
},