Permalink
Browse files

Bug 601890: Move HUDService to tier_app, and from toolkit.jar to brow…

…ser.jar. r=Mitch a=blocking-beta7

--HG--
branch : GECKO20b7pre_20101006_RELBRANCH
  • Loading branch information...
1 parent d5c106c commit b99473313d6312782b2cb16b33e71b52de1d2de9 @khuey khuey committed Oct 7, 2010
Showing with 21 additions and 23 deletions.
  1. +1 −1 browser/base/content/browser.js
  2. +2 −0 browser/base/jar.mn
  3. +2 −0 browser/build.mk
  4. +0 −5 toolkit/components/console/Makefile.in
  5. +1 −1 toolkit/components/console/hudservice/HUDService.jsm
  6. +2 −2 toolkit/components/console/hudservice/tests/browser/browser_HUDServiceTestsAll.js
  7. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_warn_user_about_replaced_api.js
  8. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_580454_timestamp_l10n.js
  9. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_581231_close_button.js
  10. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585237_line_limit.js
  11. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_586142_insert_newlines.js
  12. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_586388_select_all.js
  13. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_587617_output_copy.js
  14. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588342_document_focus.js
  15. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_588967_input_expansion.js
  16. +1 −1 ...kit/components/console/hudservice/tests/browser/browser_webconsole_bug_593003_iframe_wrong_hud.js
  17. +1 −1 ...nents/console/hudservice/tests/browser/browser_webconsole_bug_595350_multiple_windows_and_tabs.js
  18. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_consoleonpage.js
  19. +1 −1 toolkit/components/console/hudservice/tests/browser/browser_webconsole_netlogging.js
  20. +0 −1 toolkit/components/console/jar.mn
@@ -7937,7 +7937,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;
}
View
@@ -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)
View
@@ -47,6 +47,8 @@ endif
tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
+tier_app_dirs += toolkit/components/console/hudservice
+
tier_app_dirs += browser
installer:
@@ -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
@@ -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"
});
@@ -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");
@@ -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";
@@ -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;
@@ -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";
@@ -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";
@@ -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;
});
@@ -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/";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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/";
@@ -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;
@@ -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";
@@ -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)

0 comments on commit b994733

Please sign in to comment.