Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 10 insertions, 23 deletions

diff --git a/browser/components/sessionstore/content/aboutSessionRestore.js b/browser/components/sessionstore/content/aboutSessionRestore.js
index 51bed7c51b..2dfa45d40f 100644
--- a/browser/components/sessionstore/content/aboutSessionRestore.js
+++ b/browser/components/sessionstore/content/aboutSessionRestore.js
@@ -204,7 +204,7 @@ function startNewSession() {
       ),
     });
   } else {
-    getBrowserWindow().BrowserHome();
+    getBrowserWindow().BrowserCommands.home();
   }
 }
 
@@ -325,31 +325,31 @@ var treeView = {
   setTree(treeBox) {
     this.treeBox = treeBox;
   },
-  getCellText(idx, column) {
+  getCellText(idx) {
     return gTreeData[idx].label;
   },
   isContainer(idx) {
     return "open" in gTreeData[idx];
   },
-  getCellValue(idx, column) {
+  getCellValue(idx) {
     return gTreeData[idx].checked;
   },
   isContainerOpen(idx) {
     return gTreeData[idx].open;
   },
-  isContainerEmpty(idx) {
+  isContainerEmpty() {
     return false;
   },
-  isSeparator(idx) {
+  isSeparator() {
     return false;
   },
   isSorted() {
     return false;
   },
-  isEditable(idx, column) {
+  isEditable() {
     return false;
   },
-  canDrop(idx, orientation, dt) {
+  canDrop() {
     return false;
   },
   getLevel(idx) {
@@ -438,10 +438,10 @@ var treeView = {
     return null;
   },
 
-  cycleHeader(column) {},
-  cycleCell(idx, column) {},
+  cycleHeader() {},
+  cycleCell() {},
   selectionChanged() {},
-  getColumnProperties(column) {
+  getColumnProperties() {
     return "";
   },
 };
diff --git a/browser/components/sessionstore/content/content-sessionStore.js b/browser/components/sessionstore/content/content-sessionStore.js
deleted file mode 100644
index a4bdea0bdc..0000000000
--- a/browser/components/sessionstore/content/content-sessionStore.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* eslint-env mozilla/frame-script */
-
-"use strict";
-
-const { ContentSessionStore } = ChromeUtils.importESModule(
-  "resource:///modules/sessionstore/ContentSessionStore.sys.mjs"
-);
-
-void new ContentSessionStore(this);