From a2341d65e46e610b5b8dd452eb207c657fab426c Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Thu, 11 Feb 2016 04:29:47 -0800 Subject: [PATCH] Bug 1245462 - Cleanup various require/import in devtools. r=jryans --- devtools/client/inspector/shared/test/head.js | 3 +-- .../responsivedesign/responsivedesign.jsm | 17 +++++++---------- .../shared/components/test/mochitest/head.js | 2 +- devtools/client/webconsole/hudservice.js | 6 +++--- devtools/shared/gcli/commands/calllog.js | 9 +-------- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/devtools/client/inspector/shared/test/head.js b/devtools/client/inspector/shared/test/head.js index de49384c7281..5857f12c7f29 100644 --- a/devtools/client/inspector/shared/test/head.js +++ b/devtools/client/inspector/shared/test/head.js @@ -14,8 +14,7 @@ var DevToolsUtils = require("devtools/shared/DevToolsUtils"); var promise = require("promise"); var {editableField, getInplaceEditorForSpan: inplaceEditor} = require("devtools/client/shared/inplace-editor"); -var {console} = - Components.utils.import("resource://gre/modules/Console.jsm", {}); +var {console} = Cu.import("resource://gre/modules/Console.jsm", {}); // All tests are asynchronous waitForExplicitFinish(); diff --git a/devtools/client/responsivedesign/responsivedesign.jsm b/devtools/client/responsivedesign/responsivedesign.jsm index 367f3b7e139d..540853b57010 100644 --- a/devtools/client/responsivedesign/responsivedesign.jsm +++ b/devtools/client/responsivedesign/responsivedesign.jsm @@ -7,21 +7,18 @@ const Ci = Components.interfaces; const Cu = Components.utils; -Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://devtools/client/framework/gDevTools.jsm"); -Cu.import("resource://devtools/shared/event-emitter.js"); -Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "SystemAppProxy", - "resource://gre/modules/SystemAppProxy.jsm"); - -var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {}); +var { loader, require } = Cu.import("resource://devtools/shared/Loader.jsm", {}); var Telemetry = require("devtools/client/shared/telemetry"); var { showDoorhanger } = require("devtools/client/shared/doorhanger"); var { TouchEventSimulator } = require("devtools/shared/touch/simulator"); var { Task } = require("resource://gre/modules/Task.jsm"); var promise = require("promise"); var DevToolsUtils = require("devtools/shared/DevToolsUtils"); +var Services = require("Services"); +var EventEmitter = require("devtools/shared/event-emitter"); +var { ViewHelpers } = require("devtools/client/shared/widgets/ViewHelpers.jsm"); +loader.lazyImporter(this, "SystemAppProxy", + "resource://gre/modules/SystemAppProxy.jsm"); this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"]; @@ -1092,6 +1089,6 @@ ResponsiveUI.prototype = { }, } -XPCOMUtils.defineLazyGetter(ResponsiveUI.prototype, "strings", function () { +loader.lazyGetter(ResponsiveUI.prototype, "strings", function () { return Services.strings.createBundle("chrome://devtools/locale/responsiveUI.properties"); }); diff --git a/devtools/client/shared/components/test/mochitest/head.js b/devtools/client/shared/components/test/mochitest/head.js index 218c0a1d9c01..f037dc370553 100644 --- a/devtools/client/shared/components/test/mochitest/head.js +++ b/devtools/client/shared/components/test/mochitest/head.js @@ -8,10 +8,10 @@ Cu.import("resource://testing-common/Assert.jsm"); Cu.import("resource://gre/modules/Task.jsm"); var { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); -var { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {}); var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {}); var { gDevTools } = require("devtools/client/framework/devtools"); var { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {}); +var promise = require("promise"); var { DebuggerServer } = require("devtools/server/main"); var { DebuggerClient } = require("devtools/shared/client/main"); var DevToolsUtils = require("devtools/shared/DevToolsUtils"); diff --git a/devtools/client/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js index 4df5bc1c3947..34828bc629af 100644 --- a/devtools/client/webconsole/hudservice.js +++ b/devtools/client/webconsole/hudservice.js @@ -14,13 +14,13 @@ var {TargetFactory} = require("devtools/client/framework/target"); var {Tools} = require("devtools/client/definitions"); var promise = require("promise"); -loader.lazyGetter(this, "Telemetry", () => require("devtools/client/shared/telemetry")); -loader.lazyGetter(this, "WebConsoleFrame", () => require("devtools/client/webconsole/webconsole").WebConsoleFrame); loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm"); +loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry"); +loader.lazyRequireGetter(this, "WebConsoleFrame", "devtools/client/webconsole/webconsole", true); loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true); loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true); loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main", true); -loader.lazyGetter(this, "showDoorhanger", () => require("devtools/client/shared/doorhanger").showDoorhanger); +loader.lazyRequireGetter(this, "showDoorhanger", "devtools/client/shared/doorhanger", true); loader.lazyRequireGetter(this, "viewSource", "devtools/client/shared/view-source"); const STRINGS_URI = "chrome://devtools/locale/webconsole.properties"; diff --git a/devtools/shared/gcli/commands/calllog.js b/devtools/shared/gcli/commands/calllog.js index 54e11e8fd2bf..f3c57aca56ef 100644 --- a/devtools/shared/gcli/commands/calllog.js +++ b/devtools/shared/gcli/commands/calllog.js @@ -8,17 +8,10 @@ const { Cc, Ci, Cu } = require("chrome"); const l10n = require("gcli/l10n"); const gcli = require("gcli/index"); const { gDevTools } = require("devtools/client/framework/devtools"); +const Debugger = require("Debugger"); loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/target", true); - -loader.lazyGetter(this, "Debugger", () => { - let global = Cu.getGlobalForObject({}); - let JsDebugger = Cu.import("resource://gre/modules/jsdebugger.jsm", {}); - JsDebugger.addDebuggerToGlobal(global); - return global.Debugger; -}); - var debuggers = []; var chromeDebuggers = []; var sandboxes = [];