Revert "browser(firefox): allow passing user preferences at launch time (#2416)"

This commit is contained in:
Pavel Feldman 2020-05-29 22:24:30 -07:00
parent a247f7d2a5
commit fdd8df608f
2 changed files with 5 additions and 25 deletions

View File

@ -1 +1 @@
1099
1100

View File

@ -3086,10 +3086,10 @@ index 0000000000000000000000000000000000000000..921cea40e11588805a0ab014e810c6af
+this.TargetRegistry = TargetRegistry;
diff --git a/juggler/components/juggler.js b/juggler/components/juggler.js
new file mode 100644
index 0000000000000000000000000000000000000000..216de102b24a7aacd090bde858338ca7f1b0b3de
index 0000000000000000000000000000000000000000..4905a1bc7c585d3d1bf33430991d190cee75e332
--- /dev/null
+++ b/juggler/components/juggler.js
@@ -0,0 +1,100 @@
@@ -0,0 +1,80 @@
+const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const {Dispatcher} = ChromeUtils.import("chrome://juggler/content/protocol/Dispatcher.js");
@ -3120,21 +3120,9 @@ index 0000000000000000000000000000000000000000..216de102b24a7aacd090bde858338ca7
+ /* nsICommandLineHandler */
+ handle: async function(cmdLine) {
+ const jugglerFlag = cmdLine.handleFlagWithParam("juggler", false);
+ if (!jugglerFlag)
+ if (!jugglerFlag || isNaN(jugglerFlag))
+ return;
+ let port = 0;
+ let userPrefs = {};
+ if (isNaN(jugglerFlag)) {
+ try {
+ const jugglerValue = JSON.parse(jugglerFlag);
+ port = jugglerValue.port || 0;
+ userPrefs = jugglerValue.userPrefs;
+ } catch (e) {
+ throw new Error("juggler should either be a number or a JSON string");
+ }
+ } else {
+ port = parseInt(jugglerFlag, 10);
+ }
+ const port = parseInt(jugglerFlag, 10);
+ const silent = cmdLine.preventDefault;
+ if (silent)
+ Services.startup.enterLastWindowClosingSurvivalArea();
@ -3167,14 +3155,6 @@ index 0000000000000000000000000000000000000000..216de102b24a7aacd090bde858338ca7
+ });
+
+ Services.mm.loadFrameScript(FRAME_SCRIPT, true /* aAllowDelayedLoad */);
+ for (const [name, value] of Object.entries(userPrefs)) {
+ if (typeof value === 'string')
+ Services.prefs.setCharPref(name, value);
+ else if (typeof value === 'number')
+ Services.prefs.setIntPref(name, value);
+ else if (typeof value === 'bool')
+ Services.prefs.setBoolPref(name, value);
+ }
+ dump(`Juggler listening on ws://127.0.0.1:${this._server.port}/${token}\n`);
+ },
+