Port bug 1572336 - Merge marionette.js prefs into all-thunderbird.js. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Wed, 14 Aug 2019 09:29:29 +0200
changeset 27318 aa7d58ca2f4bb006d8b18c0a50a59368d8596a99
parent 27317 c4e99f8017a764dcb8f1d9688e9bed2456b2884c
child 27319 6c065f72218ce826ec61371a65dc944903d204ed
push id16280
push usermozilla@jorgk.com
push dateWed, 14 Aug 2019 07:32:15 +0000
treeherdercomm-central@aa7d58ca2f4b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1572336
Port bug 1572336 - Merge marionette.js prefs into all-thunderbird.js. rs=bustage-fix
mail/app/profile/all-thunderbird.js
mail/installer/package-manifest.in
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -789,8 +789,41 @@ pref("intl.regional_prefs.use_os_locales
 // Multi-lingual preferences
 pref("intl.multilingual.enabled", false);
 
 // We don't support yet language pack download from ATN
 pref("intl.multilingual.downloadEnabled", false);
 
 // Dark in-content pages
 pref("browser.in-content.dark-mode", true);
+
+// Marionette is the remote protocol that lets OOP programs communicate with,
+// instrument, and control Gecko.
+
+// Starts and stops the Marionette server.
+pref("marionette.enabled", false);
+
+// Delay server startup until a modal dialogue has been clicked to allow time
+// for user to set breakpoints in the Browser Toolbox.
+pref("marionette.debugging.clicktostart", false);
+
+// Verbosity of Marionette logger repository.
+//
+// Available levels are, in descending order of severity, "trace", "debug",
+// "config", "info", "warn", "error", and "fatal". The value is treated
+// case-insensitively.
+pref("marionette.log.level", "Info");
+
+// Certain log messages that are known to be long are truncated. This
+// preference causes them to not be truncated.
+pref("marionette.log.truncate", true);
+
+// Port to start Marionette server on.
+pref("marionette.port", 2828);
+
+// Sets recommended automation preferences when Marionette is started.
+pref("marionette.prefs.recommended", true);
+
+// Whether content scripts can be safely reused.
+//
+// Deprecated and scheduled for removal with
+// https://bugzil.la/marionette-window-tracking
+pref("marionette.contentListener", false);
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -412,17 +412,16 @@
 @RESPATH@/components/l10n-registry.manifest
 
 ; Remote control protocol
 #ifdef ENABLE_MARIONETTE
 @RESPATH@/chrome/marionette@JAREXT@
 @RESPATH@/chrome/marionette.manifest
 @RESPATH@/components/marionette.manifest
 @RESPATH@/components/marionette.js
-@RESPATH@/defaults/pref/marionette.js
 #endif
 
 
 ; Phishing Protection
 
 ; Modules
 @RESPATH@/modules/*
 @RESPATH@/actors/*