Bug 601890: Move HUDService to tier_app, and from toolkit.jar to browser.jar. r=Mitch a=blocking-beta7

browser/base/content/browser.js

@@ -7934,7 +7934,7 @@ var TabContextMenu = {
 };
 
 XPCOMUtils.defineLazyGetter(this, "HUDConsoleUI", function () {
-  Cu.import("resource://gre/modules/HUDService.jsm");
+  Cu.import("resource:///modules/HUDService.jsm");
   try {
     return HUDService.consoleUI;
   }

browser/base/jar.mn

@@ -87,3 +87,5 @@ browser.jar:
 # the following files are browser-specific overrides
 *       content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
+# XXXkhuey This really should live in browser/, but it's too late in the release cycle to move
++       content/browser/NetworkPanel.xhtml            (/toolkit/components/console/hudservice/NetworkPanel.xhtml)

browser/build.mk

@@ -47,6 +47,8 @@ endif
 
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 
+tier_app_dirs += toolkit/components/console/hudservice
+
 tier_app_dirs += browser
 
 installer:

toolkit/components/console/Makefile.in

@@ -45,10 +45,5 @@ include $(DEPTH)/config/autoconf.mk
 
 EXTRA_PP_COMPONENTS = jsconsole-clhandler.js jsconsole-clhandler.manifest
 
-ifeq (browser,$(MOZ_BUILD_APP))
-PARALLEL_DIRS = hudservice \
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 

toolkit/components/console/hudservice/HUDService.jsm

@@ -614,7 +614,7 @@ function NetworkPanel(aParent, aHttpActivity)
 
   // Create the browser that displays the NetworkPanel XHTML.
   this.browser = createAndAppendElement(this.panel, "browser", {
-    src: "chrome://global/content/NetworkPanel.xhtml",
+    src: "chrome://browser/content/NetworkPanel.xhtml",
     disablehistory: "true",
     flex: "1"
   });

toolkit/components/console/hudservice/tests/browser/browser_HUDServiceTestsAll.js

@@ -46,7 +46,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "HUDService", function () {
   try {
-    Cu.import("resource://gre/modules/HUDService.jsm");
+    Cu.import("resource:///modules/HUDService.jsm");
   }
   catch (ex) {
     dump(ex + "\n");
@@ -56,7 +56,7 @@ XPCOMUtils.defineLazyGetter(this, "HUDService", function () {
 
 XPCOMUtils.defineLazyGetter(this, "ConsoleUtils", function () {
   try {
-    Cu.import("resource://gre/modules/HUDService.jsm");
+    Cu.import("resource:///modules/HUDService.jsm");
   }
   catch (ex) {
     dump(ex + "\n");

toolkit/components/console/hudservice/tests/browser/browser_warn_user_about_replaced_api.js

@@ -41,7 +41,7 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_REPLACED_API_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console-replaced-api.html";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580454_timestamp_l10n.js

@@ -11,7 +11,7 @@
 // Tests that appropriately-localized timestamps are printed.
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 function test() {
   const TEST_TIMESTAMP = 12345678;

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_581231_close_button.js

@@ -11,7 +11,7 @@
 // Tests that the Web Console close button functions.
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585237_line_limit.js

@@ -13,7 +13,7 @@
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_586142_insert_newlines.js

@@ -20,7 +20,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 const TEST_URI = "http://example.com/";
 
 XPCOMUtils.defineLazyGetter(this, "HUDService", function () {
-  Cu.import("resource://gre/modules/HUDService.jsm");
+  Cu.import("resource:///modules/HUDService.jsm");
   return HUDService;
 });
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_586388_select_all.js

@@ -10,7 +10,7 @@
 
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_URI = "http://example.com/";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_587617_output_copy.js

@@ -9,7 +9,7 @@
 
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588342_document_focus.js

@@ -12,7 +12,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588967_input_expansion.js

@@ -38,7 +38,7 @@
 
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-console.html";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_593003_iframe_wrong_hud.js

@@ -39,7 +39,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-593003-iframe-wrong-hud.html";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595350_multiple_windows_and_tabs.js

@@ -12,7 +12,7 @@
 // opened and then closed.
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_URI = "http://example.com/";
 

toolkit/components/console/hudservice/tests/browser/browser_webconsole_consoleonpage.js

@@ -12,7 +12,7 @@
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 let hud;
 let hudId;

toolkit/components/console/hudservice/tests/browser/browser_webconsole_netlogging.js

@@ -13,7 +13,7 @@ const Ci = Components.interfaces;
 const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/HUDService.jsm");
+Cu.import("resource:///modules/HUDService.jsm");
 
 const TEST_NETWORK_REQUEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-network-request.html";
 

toolkit/components/console/jar.mn

@@ -1,6 +1,5 @@
 toolkit.jar:
 *+ content/global/console.js                            (content/console.js)
 *+ content/global/console.xul                           (content/console.xul)
-+  content/global/NetworkPanel.xhtml                    (hudservice/NetworkPanel.xhtml)
 +  content/global/console.css                           (content/console.css)
 +  content/global/consoleBindings.xml                   (content/consoleBindings.xml)