Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1388738 - reuse devtools-startup initDevTools in DevToolsShim;r=ochameau

Browse Source 
MozReview-Commit-ID: 7Qr06CZBYuf

--HG--
extra : rebase_source : 55e275f49c14ada8d9633a2999ce0a86382055b9
This commit is contained in:
Julian Descottes 2017-08-09 17:17:46 +02:00
parent aedd2b0e08
commit 62b13a707c
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
devtools/shim/DevToolsShim.jsm
View File

@ -4,10 +4,16 @@
"use strict";
const Cu = Components.utils;
const Ci = Components.interfaces;
const {utils: Cu, classes: Cc, interfaces: Ci} = Components;
const { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
const { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
XPCOMUtils.defineLazyGetter(this, "DevtoolsStartup", () => {
return Cc["@mozilla.org/devtools/startup-clh;1"]
.getService(Ci.nsICommandLineHandler)
.wrappedJSObject;
});
this.EXPORTED_SYMBOLS = [
"DevToolsShim",
];
@ -230,12 +236,24 @@ this.DevToolsShim = {
return Promise.resolve();
}
// Initialize DevTools explicitly to pass the "ContextMenu" reason to telemetry.
if (!this.isInitialized()) {
this._initDevTools("ContextMenu");
}
return this.gDevTools.inspectNode(tab, selectors);
},
_initDevTools: function () {
let { loader } = Cu.import("resource://devtools/shared/Loader.jsm", {});
loader.require("devtools/client/framework/devtools-browser");
/**
* Initialize DevTools via the devtools-startup command line handler component.
* Overridden in tests.
*
* @param {String} reason
* optional, if provided should be a valid entry point for DEVTOOLS_ENTRY_POINT
* in toolkit/components/telemetry/Histograms.json
*/
_initDevTools: function (reason) {
DevtoolsStartup.initDevTools(reason);
},
_onDevToolsRegistered: function () {