Bug 607163 - Part 2: Move the Web Console CSS to browser.xul and fix a small ensuing styling regression, r=dao, a=gavin

browser/base/content/browser.xul

@@ -53,6 +53,7 @@
 
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
+<?xml-stylesheet href="chrome://global/skin/webConsole.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>

toolkit/components/console/hudservice/HUDService.jsm

@@ -59,10 +59,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "activityDistributor",
                                    "@mozilla.org/network/http-activity-distributor;1",
                                    "nsIHttpActivityDistributor");
 
-XPCOMUtils.defineLazyServiceGetter(this, "sss",
-                                   "@mozilla.org/content/style-sheet-service;1",
-                                   "nsIStyleSheetService");
-
 XPCOMUtils.defineLazyServiceGetter(this, "mimeService",
                                    "@mozilla.org/mime;1",
                                    "nsIMIMEService");
@@ -100,7 +96,6 @@ function LogFactory(aMessagePrefix)
 
 let log = LogFactory("*** HUDService:");
 
-const HUD_STYLESHEET_URI = "chrome://global/skin/webConsole.css";
 const HUD_STRINGS_URI = "chrome://global/locale/headsUpDisplay.properties";
 
 XPCOMUtils.defineLazyGetter(this, "stringBundle", function () {
@@ -1347,10 +1342,6 @@ function HUD_SERVICE()
   this.onTabClose = this.onTabClose.bind(this);
   this.onWindowUnload = this.onWindowUnload.bind(this);
 
-  // load stylesheet with StyleSheetService
-  var uri = Services.io.newURI(HUD_STYLESHEET_URI, null, null);
-  sss.loadAndRegisterSheet(uri, sss.AGENT_SHEET);
-
   // begin observing HTTP traffic
   this.startHTTPObservation();
 };

toolkit/themes/pinstripe/global/webConsole.css

@@ -121,7 +121,6 @@
 .hud-filter-cat {
   color: #6b6b6b;
   font-weight: bold;
-  margin: 0px 12px 0px 0px;
 }
 
 /* JSTerm Styles */