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

Bug 340898 Remove the pref .sessionstore.resume_session in favor of .startup.page (for nickolay, r=dietrich)

Browse Source
This commit is contained in:
dietrich%mozilla.com 2006-07-19 19:21:06 +00:00
parent 90c4cfb72c
commit d6bc622d98
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
browser/components/sessionstore/src/nsSessionStartup.js
View File

@ -40,12 +40,12 @@
* Session Storage and Restoration
*
* Overview
* This service user's session file at startup, and makes a determination as to
* whether the session should be restored. It fill restore the session under
* the circumstances described below.
* This service reads user's session file at startup, and makes a determination
* as to whether the session should be restored. It will restore the session
* under the circumstances described below.
*
* Crash Detection
* The initial segment of the INI file is has a single field, "state", that
* The session file stores a session.state property, that
* indicates whether the browser is currently running. When the browser shuts
* down, the field is changed to "stopped". At startup, this field is read, and
* if it's value is "running", then it's assumed that the browser had previously
@ -58,8 +58,8 @@
* and the session will be restored the next time the browser starts.
*
* Always Resume
* This service will always resume the session if the boolean pref
* browser.sessionstore.resume_session is set to true.
* This service will always resume the session if the integer pref
* browser.startup.page is set to 3.
*/
/* :::::::: Constants and Helpers ::::::::::::::: */
@ -84,9 +84,6 @@ const STATE_RUNNING_STR = "running";
// whether the service is enabled
const DEFAULT_ENABLED = true;
// resume the current session at startup (otherwise just recover)
const DEFAULT_RESUME_SESSION = false;
// resume the current session at startup just this once
const DEFAULT_RESUME_SESSION_ONCE = false;
@ -222,17 +219,12 @@ SessionStartup.prototype = {
/* ........ Auxiliary Functions .............. */
/**
* Whether or not to resume session, if not recovering from a crash
* Returns true if:
* - pref is set to always resume sessions
* - pref is set to resume session once
* - user configured startup page to be the last-visited page
* Whether or not to resume session, if not recovering from a crash.
* @returns bool
*/
_doResumeSession: function sss_doResumeSession() {
return this._getPref("sessionstore.resume_session", DEFAULT_RESUME_SESSION) ||
this._getPref("sessionstore.resume_session_once", DEFAULT_RESUME_SESSION_ONCE) ||
this._getPref("startup.page", 1) == 2;
return this._getPref("startup.page", 1) == 3 ||
this._getPref("sessionstore.resume_session_once", DEFAULT_RESUME_SESSION_ONCE);
},
/**

16
browser/components/sessionstore/src/nsSessionStore.js
View File

@ -89,9 +89,6 @@ const DEFAULT_POSTDATA = 0;
// (0 = everywhere, 1 = unencrypted sites, 2 = nowhere)
const DEFAULT_PRIVACY_LEVEL = PRIVACY_ENCRYPTED;
// resume the current session at startup (otherwise just recover)
const DEFAULT_RESUME_SESSION = false;
// resume the current session at startup just this once
const DEFAULT_RESUME_SESSION_ONCE = false;
@ -1810,22 +1807,18 @@ SessionStoreService.prototype = {
},
/**
* Whether or not to resume session, if not recovering from a crash
* Returns true if:
* - pref is set to always resume sessions
* - pref is set to resume session once
* - user configured startup page to be the last-visited page
* Whether or not to resume session, if not recovering from a crash.
* @returns bool
*/
_doResumeSession: function sss_doResumeSession() {
return this._getPref("sessionstore.resume_session", DEFAULT_RESUME_SESSION)
|| this._getPref("sessionstore.resume_session_once", DEFAULT_RESUME_SESSION_ONCE)
|| this._getPref("startup.page", 1) == 2;
return this._getPref("startup.page", 1) == 3 ||
this._getPref("sessionstore.resume_session_once", DEFAULT_RESUME_SESSION_ONCE);
},
/**
* whether the user wants to load any other page at startup
* (except the homepage) - needed for determining whether to overwrite the current tabs
* C.f.: nsBrowserContentHandler's defaultArgs implementation.
* @returns bool
*/
_isCmdLineEmpty: function sss_isCmdLineEmpty(aWindow) {
@ -1836,6 +1829,7 @@ SessionStoreService.prototype = {
var homepage = null;
switch (this._getPref("startup.page", 1)) {
case 0:
case 3:
homepage = "about:blank";
break;
case 1: