Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 517708 - use gBrowser instead of getBrowser() in session restore code. r=zeniko

Browse Source
This commit is contained in:
Dão Gottwald 2009-09-19 21:38:58 +02:00
parent ace91c0d7d
commit 56eb3f1112
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/sessionstore/nsISessionStore.idl
View File

@ -56,7 +56,7 @@ interface nsIDOMNode;
* by looking for "navigator:browser" windows.
*
* * "Tabbrowser tabs" are all the child nodes of a browser window's
* |getBrowser().tabContainer| such as e.g. |getBrowser().selectedTab|.
* |gBrowser.tabContainer| such as e.g. |gBrowser.selectedTab|.
*/
[scriptable, uuid(70592a0d-87d3-459c-8db7-dcb8d47af78e)]

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

@ -948,7 +948,7 @@ SessionStoreService.prototype = {
var sourceWindow = aTab.ownerDocument.defaultView;
this._updateTextAndScrollDataForTab(sourceWindow, aTab.linkedBrowser, tabState, true);
var newTab = aWindow.getBrowser().addTab();
var newTab = aWindow.gBrowser.addTab();
this.restoreHistoryPrecursor(aWindow, [newTab], [tabState], 0, 0, 0);
return newTab;
@ -1118,7 +1118,7 @@ SessionStoreService.prototype = {
* Window reference
*/
_saveWindowHistory: function sss_saveWindowHistory(aWindow) {
var tabbrowser = aWindow.getBrowser();
var tabbrowser = aWindow.gBrowser;
var tabs = tabbrowser.mTabs;
var tabsData = this._windows[aWindow.__SSi].tabs = [];
@ -1399,7 +1399,7 @@ SessionStoreService.prototype = {
* Window reference
*/
_updateTextAndScrollData: function sss_updateTextAndScrollData(aWindow) {
var browsers = aWindow.getBrowser().browsers;
var browsers = aWindow.gBrowser.browsers;
for (var i = 0; i < browsers.length; i++) {
try {
var tabData = this._windows[aWindow.__SSi].tabs[i];
@ -1917,7 +1917,7 @@ SessionStoreService.prototype = {
*/
restoreHistoryPrecursor:
function sss_restoreHistoryPrecursor(aWindow, aTabs, aTabData, aSelectTab, aIx, aCount) {
var tabbrowser = aWindow.getBrowser();
var tabbrowser = aWindow.gBrowser;
// make sure that all browsers and their histories are available
// - if one's not, resume this check in 100ms (repeat at most 10 times)
@ -2031,7 +2031,7 @@ SessionStoreService.prototype = {
var tab = aTabs.shift();
var tabData = aTabData.shift();
var browser = aWindow.getBrowser().getBrowserForTab(tab);
var browser = aWindow.gBrowser.getBrowserForTab(tab);
var history = browser.webNavigation.sessionHistory;
if (history.count > 0) {
@ -2727,7 +2727,7 @@ SessionStoreService.prototype = {
return;
}
try {
var currentURI = aWindow.getBrowser().currentURI.clone();
var currentURI = aWindow.gBrowser.currentURI.clone();
// if the current URI contains a username/password, remove it
try {
currentURI.userPass = "";