After bug 515006 there is a problem when you have a home page, and that is when you close the browser window and then reopen it you get the home page as well as the restored tabs. There should be way to tell navigator.js that sessionstore is restoring window to avoid triggering "browser.windows.loadOnNewWindow" or "browser.startup.page". More details can be found on bug 515006 comment #11

browser.startup.page is actually handled in nsBrowserContentHandler.js; the easiest way to communicate between that and Session Storage seems to be to add a new method to nsISessionStore.idl to see if it is about to restore a window. Then getURLToLoad() can call that method and return "about:blank" (like it does when restoring from session startup).

Ok, then it session restore bug. Taking.

There is method in nsSessionStartup called doRestore. It used in GetURLtoLoad. Should do the job here too.

Comment on attachment 404779 [details] [diff] [review] use doRestore nsBrowserContentHandler already calls doRestore, and that doesn't work anyway because doRestore doesn't know about _restoreLastWindow.

Comment on attachment 404796 [details] [diff] [review] add new method and use it >diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js You don't need this change because BrowserOpenWindow() calls nsBrowserContentHandler anyway. >+ var st = Components.classes["@mozilla.org/suite/sessionstore;1"] >+ .getService(Components.interfaces.nsISessionStore); Bah, I just noticed that the nsISessionStartup that you copied this from doesn't have the .getService lined up with .classes either :-( >+ boolean getRestoreLastWindow(); I think that this might be better named doRestoreLastWindow. >+ getRestoreLastWindow: function sss_getRestoreLastWindow() { >+ return this._restoreLastWindow; This isn't quite right; you need to check the resume prefs and check that you have a non-popup window that you can actually restore. (See sss_onLoad. About the only thing you don't have to check for is the toolbar, since we know we're not opening a popup window.)

Fixed all your comments, ran chrome tests, all passing.

(In reply to comment #7) > Fixed all your comments Not quite, you didn't check for a window that wasn't a popup.

OK, i've used same check as in sss_onLoad. That will be enough if my English doesn't playing with me again.

Comment on attachment 404812 [details] [diff] [review] use same check as in sss_onLoad >+ return (this._restoreLastWindow && aWindow.toolbar.visible && >+ this._closedWindows.length && this._doResumeSession()); Sorry, that's the wrong check - it's the closed window that you need to check.

Comment on attachment 405836 [details] [diff] [review] fixed patch [Checkin: Comment 12] http://hg.mozilla.org/comm-central/rev/3291966677c0