Merging upstream version 126.0.

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

1 files changed, 10 insertions, 0 deletions

diff --git a/devtools/client/framework/toolbox-options.js b/devtools/client/framework/toolbox-options.js
index 98b263ad44..809804e2f1 100644
--- a/devtools/client/framework/toolbox-options.js
+++ b/devtools/client/framework/toolbox-options.js
@@ -106,6 +106,10 @@ OptionsPanel.prototype = {
       "devtools.source-map.client-service.enabled",
       this._prefChanged
     );
+    Services.prefs.addObserver(
+      "devtools.toolbox.splitconsole.enabled",
+      this._prefChanged
+    );
     gDevTools.on("theme-registered", this._themeRegistered);
     gDevTools.on("theme-unregistered", this._themeUnregistered);
 
@@ -126,6 +130,10 @@ OptionsPanel.prototype = {
       "devtools.source-map.client-service.enabled",
       this._prefChanged
     );
+    Services.prefs.removeObserver(
+      "devtools.toolbox.splitconsole.enabled",
+      this._prefChanged
+    );
 
     this.toolbox.off("tool-registered", this.setupToolsList);
     this.toolbox.off("tool-unregistered", this.setupToolsList);
@@ -145,6 +153,8 @@ OptionsPanel.prototype = {
       this.updateCurrentTheme();
     } else if (prefName === "devtools.source-map.client-service.enabled") {
       this.updateSourceMapPref();
+    } else if (prefName === "devtools.toolbox.splitconsole.enabled") {
+      this.toolbox.updateIsSplitConsoleEnabled();
     }
   },