wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 481598 - Starting Private browsing from window-less state shows last closed tab from PB mode in list of recently closed tabs after stop. r=gavin

Browse Source
This commit is contained in:
Mike Connor 2009-04-09 08:43:27 +02:00
parent 5be50b1a31
commit 750ca04386
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,6 +138,16 @@ PrivateBrowsingService.prototype = {
if (!this._autoStart) {
let ss = Cc["@mozilla.org/browser/sessionstore;1"].
getService(Ci.nsISessionStore);
let blankState = JSON.stringify({
"windows": [{
"tabs": [{
"entries": [{
"url": "about:blank"
}]
}],
"_closedTabs": []
}]
});
if (this._inPrivateBrowsing) {
// whether we should save and close the current session
@ -150,8 +160,12 @@ PrivateBrowsingService.prototype = {
} catch (ex) {}
// save the whole browser state in order to restore all windows/tabs later
if (this._saveSession && !this._savedBrowserState)
this._savedBrowserState = ss.getBrowserState();
if (this._saveSession && !this._savedBrowserState) {
if (this._getBrowserWindow())
this._savedBrowserState = ss.getBrowserState();
else // no open browser windows, just restore a blank state on exit
this._savedBrowserState = blankState;
}
}
if (!this._quitting && this._saveSession) {
let browserWindow = this._getBrowserWindow();
@ -159,19 +173,8 @@ PrivateBrowsingService.prototype = {
// if there are open browser windows, load a dummy session to get a distinct
// separation between private and non-private sessions
if (browserWindow) {
// dummy session used to transition from/to pb mode, see bug 476463
let transitionState = {
"windows": [{
"tabs": [{
"entries": [{
"url": "about:blank"
}]
}],
"_closedTabs": []
}]
};
ss.setBrowserState(JSON.stringify(transitionState));
// set an empty session to transition from/to pb mode, see bug 476463
ss.setBrowserState(blankState);
// just in case the only remaining window after setBrowserState is different.
// it probably shouldn't be with the current sessionstore impl, but we shouldn't