backport m-c 1449940: Merge nsSetDefaultBrowser.js into nsBrowserContentHandler.js

5 files changed, 4 insertions, 40 deletions

diff --git a/components/nsBrowserContentHandler.js b/components/nsBrowserContentHandler.js
index 74144fc..44e567a 100644
--- a/components/nsBrowserContentHandler.js
+++ b/components/nsBrowserContentHandler.js
@@ -426,6 +426,9 @@ nsBrowserContentHandler.prototype = {
     if (cmdLine.handleFlag("private", false)) {
       PrivateBrowsingUtils.enterTemporaryAutoStartMode();
     }
+    if (cmdLine.handleFlag("setDefaultBrowser", false)) {
+      ShellService.setDefaultBrowser(true, true);
+    }
 
     var fileParam = cmdLine.handleFlagWithParam("file", false);
     if (fileParam) {
@@ -464,6 +467,7 @@ nsBrowserContentHandler.prototype = {
       info += "  --preferences                                Open Preferences dialog.\n";
     }
     info += "  --search <term>                              Search <term> with your default search engine.\n";
+    info += "  --setDefaultBrowser Set this app as the default browser.\n";
     return info;
   },
 
diff --git a/components/shell/moz.build b/components/shell/moz.build
index 94ec885..1981404 100644
--- a/components/shell/moz.build
+++ b/components/shell/moz.build
@@ -41,11 +41,6 @@ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 if SOURCES:
     FINAL_LIBRARY = 'browsercomps'
 
-EXTRA_COMPONENTS += [
-    'nsSetDefaultBrowser.js',
-    'nsSetDefaultBrowser.manifest',
-]
-
 EXTRA_JS_MODULES += [
     'ShellService.jsm',
 ]
diff --git a/components/shell/nsSetDefaultBrowser.js b/components/shell/nsSetDefaultBrowser.js
deleted file mode 100644
index c7a78c5..0000000
--- a/components/shell/nsSetDefaultBrowser.js
+++ /dev/null
@@ -1,30 +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/. */
-
-/*
- * --setDefaultBrowser commandline handler
- * Makes the current executable the "default browser".
- */
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-Components.utils.import("resource:///modules/ShellService.jsm");
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-function nsSetDefaultBrowser() {}
-
-nsSetDefaultBrowser.prototype = {
-  handle: function nsSetDefault_handle(aCmdline) {
-    if (aCmdline.handleFlag("setDefaultBrowser", false)) {
-      ShellService.setDefaultBrowser(true, true);
-    }
-  },
-
-  helpInfo: "  --setDefaultBrowser                          Set this app as the default browser.\n",
-
-  classID: Components.ID("{F57899D0-4E2C-4ac6-9E29-50C736103B0C}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]),
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([nsSetDefaultBrowser]);
diff --git a/components/shell/nsSetDefaultBrowser.manifest b/components/shell/nsSetDefaultBrowser.manifest
deleted file mode 100644
index bf3c0f0..0000000
--- a/components/shell/nsSetDefaultBrowser.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-component {F57899D0-4E2C-4ac6-9E29-50C736103B0C} nsSetDefaultBrowser.js
-contract @mozilla.org/browser/default-browser-clh;1 {F57899D0-4E2C-4ac6-9E29-50C736103B0C}
-category command-line-handler m-setdefaultbrowser @mozilla.org/browser/default-browser-clh;1
diff --git a/installer/package-manifest.in b/installer/package-manifest.in
index bf347b5..7eb4b31 100644
--- a/installer/package-manifest.in
+++ b/installer/package-manifest.in
@@ -353,8 +353,6 @@
 @RESPATH@/browser/components/BrowserComponents.manifest
 @RESPATH@/browser/components/nsBrowserContentHandler.js
 @RESPATH@/browser/components/nsBrowserGlue.js
-@RESPATH@/browser/components/nsSetDefaultBrowser.manifest
-@RESPATH@/browser/components/nsSetDefaultBrowser.js
 @RESPATH@/browser/components/devtools-startup.manifest
 @RESPATH@/browser/components/devtools-startup.js
 @RESPATH@/browser/components/webideCli.js