Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 20 insertions, 0 deletions

diff --git a/application/basilisk/components/nsIBrowserHandler.idl b/application/basilisk/components/nsIBrowserHandler.idl
new file mode 100644
index 000000000..74292f9d9
--- /dev/null
+++ b/application/basilisk/components/nsIBrowserHandler.idl
@@ -0,0 +1,20 @@
+/* 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/. */
+
+#include "nsISupports.idl"
+
+interface nsICommandLine;
+
+[scriptable, uuid(8D3F5A9D-118D-4548-A137-CF7718679069)]
+interface nsIBrowserHandler : nsISupports
+{
+  attribute AUTF8String startPage;
+  attribute AUTF8String defaultArgs;
+
+  /**
+   * Extract the width and height specified on the command line, if present.
+   * @return A feature string with a prepended comma, e.g. ",width=500,height=400"
+   */
+  AUTF8String getFeatures(in nsICommandLine aCmdLine);
+};