From 9d323e271293cd64692ba2e03216d689936c40a8 Mon Sep 17 00:00:00 2001 From: foxt7ot Date: Sun, 2 Jul 2017 23:33:15 +0530 Subject: [PATCH] Bug 1374609 Removed webide components and referneces as per issue. r=jryans --- browser/installer/package-manifest.in | 2 - devtools/client/webide/components/moz.build | 10 ---- .../client/webide/components/webideCli.js | 58 ------------------- .../components/webideComponents.manifest | 4 -- devtools/client/webide/moz.build | 1 - 5 files changed, 75 deletions(-) delete mode 100644 devtools/client/webide/components/moz.build delete mode 100644 devtools/client/webide/components/webideCli.js delete mode 100644 devtools/client/webide/components/webideComponents.manifest diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index bd96c54f4c2a..0b49a8d3bc58 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -383,8 +383,6 @@ @RESPATH@/browser/components/devtools-startup.js @RESPATH@/browser/components/aboutdebugging-registration.js @RESPATH@/browser/components/aboutdebugging.manifest -@RESPATH@/browser/components/webideCli.js -@RESPATH@/browser/components/webideComponents.manifest @RESPATH@/browser/components/Experiments.manifest @RESPATH@/browser/components/ExperimentsService.js @RESPATH@/browser/components/browser-newtab.xpt diff --git a/devtools/client/webide/components/moz.build b/devtools/client/webide/components/moz.build deleted file mode 100644 index d4047c29569c..000000000000 --- a/devtools/client/webide/components/moz.build +++ /dev/null @@ -1,10 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -EXTRA_COMPONENTS += [ - 'webideCli.js', - 'webideComponents.manifest', -] diff --git a/devtools/client/webide/components/webideCli.js b/devtools/client/webide/components/webideCli.js deleted file mode 100644 index 56241c7b186b..000000000000 --- a/devtools/client/webide/components/webideCli.js +++ /dev/null @@ -1,58 +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/. */ - -"use strict"; - -const Ci = Components.interfaces; -const Cu = Components.utils; - -const { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {}); - -XPCOMUtils.defineLazyModuleGetter(this, "Services", "resource://gre/modules/Services.jsm"); - -/** - * Handles --webide command line option. - */ - -function webideCli() { } - -webideCli.prototype = { - handle: function (cmdLine) { - if (!cmdLine.handleFlag("webide", false)) { - return; - } - - // If --webide is used remotely, we don't want to open - // a new tab. - // - // If --webide is used for a new Firefox instance, we - // want to open webide only. - cmdLine.preventDefault = true; - - let win = Services.wm.getMostRecentWindow("devtools:webide"); - if (win) { - win.focus(); - } else { - win = Services.ww.openWindow(null, - "chrome://webide/content/", - "webide", - "chrome,centerscreen,resizable,dialog=no", - null); - } - - if (cmdLine.state == Ci.nsICommandLine.STATE_INITIAL_LAUNCH) { - // If this is a new Firefox instance, and because we will only start - // webide, we need to notify "sessionstore-windows-restored" to trigger - // addons registration (for simulators and adb helper). - Services.obs.notifyObservers(null, "sessionstore-windows-restored"); - } - }, - - helpInfo: "", - - classID: Components.ID("{79b7b44e-de5e-4e4c-b7a2-044003c615d9}"), - QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler]), -}; - -this.NSGetFactory = XPCOMUtils.generateNSGetFactory([webideCli]); diff --git a/devtools/client/webide/components/webideComponents.manifest b/devtools/client/webide/components/webideComponents.manifest deleted file mode 100644 index 03af9758cba5..000000000000 --- a/devtools/client/webide/components/webideComponents.manifest +++ /dev/null @@ -1,4 +0,0 @@ -# webide components -component {79b7b44e-de5e-4e4c-b7a2-044003c615d9} webideCli.js -contract @mozilla.org/browser/webide-clh;1 {79b7b44e-de5e-4e4c-b7a2-044003c615d9} -category command-line-handler a-webide @mozilla.org/browser/webide-clh;1 diff --git a/devtools/client/webide/moz.build b/devtools/client/webide/moz.build index c1fc17be84da..42e048491d9b 100644 --- a/devtools/client/webide/moz.build +++ b/devtools/client/webide/moz.build @@ -6,7 +6,6 @@ DIRS += [ 'content', - 'components', 'modules', 'themes', ]