Bug 829460 - Get CmdCommands from the right url in DeveloperToolbar.jsm. r=paul
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 11 Jan 2013 12:24:53 +0100
changeset 118561 dd30a971ed826e38f78f4da26eb648aedb6288b0
parent 118560 b88aa014ffa625287e66797324052c40f800ce71
child 118562 8461f75fd62b94662718606d6198b48a0a5def49
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerspaul
bugs829460
milestone21.0a1
Bug 829460 - Get CmdCommands from the right url in DeveloperToolbar.jsm. r=paul
browser/devtools/commandline/BuiltinCommands.jsm
browser/devtools/shared/DeveloperToolbar.jsm
--- a/browser/devtools/commandline/BuiltinCommands.jsm
+++ b/browser/devtools/commandline/BuiltinCommands.jsm
@@ -1,15 +1,15 @@
 /* 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/. */
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
-this.EXPORTED_SYMBOLS = [ "CmdAddonFlags" ];
+this.EXPORTED_SYMBOLS = [ "CmdAddonFlags", "CmdCommands" ];
 
 Cu.import("resource:///modules/devtools/gcli.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
                                   "resource:///modules/devtools/gDevTools.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TargetFactory",
--- a/browser/devtools/shared/DeveloperToolbar.jsm
+++ b/browser/devtools/shared/DeveloperToolbar.jsm
@@ -17,17 +17,17 @@ const Node = Components.interfaces.nsIDO
 
 XPCOMUtils.defineLazyModuleGetter(this, "console",
                                   "resource://gre/modules/devtools/Console.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "gcli",
                                   "resource:///modules/devtools/gcli.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "CmdCommands",
-                                  "resource:///modules/devtools/CmdCmd.jsm");
+                                  "resource:///modules/devtools/BuiltinCommands.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "PageErrorListener",
                                   "resource://gre/modules/devtools/WebConsoleUtils.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "prefBranch", function() {
   let prefService = Components.classes["@mozilla.org/preferences-service;1"]
           .getService(Components.interfaces.nsIPrefService);
   return prefService.getBranch(null)