bug 679364 - Use content/browser/devtools/* for aliases; r=rcampbell
authorBrandon Benvie <bbenvie>
Tue, 30 Apr 2013 11:56:00 -0400
changeset 130987 4a068034be50faf82054c2523c7b755ab65961e0
parent 130986 dfebbc8393922a4cdfca78685a0dd55ebb53375f
child 130988 3163ebad7884ae28f31a3915c6dfe377aa1ba78e
push idunknown
push userunknown
push dateunknown
reviewersrcampbell
bugs679364
milestone23.0a1
bug 679364 - Use content/browser/devtools/* for aliases; r=rcampbell
browser/devtools/debugger/DebuggerUI.jsm
browser/devtools/debugger/debugger.xul
browser/devtools/jar.mn
browser/devtools/main.js
browser/devtools/profiler/ProfilerPanel.jsm
browser/devtools/profiler/profiler.xul
browser/devtools/scratchpad/scratchpad-manager.jsm
browser/devtools/scratchpad/scratchpad.xul
browser/devtools/sourceeditor/source-editor-orion.jsm
browser/devtools/styleeditor/styleeditor.xul
browser/devtools/webconsole/NetworkPanel.jsm
--- a/browser/devtools/debugger/DebuggerUI.jsm
+++ b/browser/devtools/debugger/DebuggerUI.jsm
@@ -4,17 +4,17 @@
  * 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/. */
 "use strict";
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-const DBG_XUL = "chrome://browser/content/debugger.xul";
+const DBG_XUL = "chrome://browser/content/devtools/debugger.xul";
 const DBG_STRINGS_URI = "chrome://browser/locale/devtools/debugger.properties";
 const CHROME_DEBUGGER_PROFILE_NAME = "-chrome-debugger";
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this,
   "DebuggerServer", "resource://gre/modules/devtools/dbg-server.jsm");
 
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/devtools/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/debugger.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/devtools/debugger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/debugger.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % debuggerDTD SYSTEM "chrome://browser/locale/devtools/debugger.dtd">
   %debuggerDTD;
 ]>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
-<?xul-overlay href="chrome://browser/content/source-editor-overlay.xul"?>
+<?xul-overlay href="chrome://browser/content/devtools/source-editor-overlay.xul"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="text/javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="text/javascript" src="debugger-controller.js"/>
   <script type="text/javascript" src="debugger-view.js"/>
   <script type="text/javascript" src="debugger-toolbar.js"/>
   <script type="text/javascript" src="debugger-panes.js"/>
 
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -1,68 +1,68 @@
 # 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/.
 
 browser.jar:
-    content/browser/devtools/widgets.css          (shared/widgets/widgets.css)
-    content/browser/devtools/widgets/VariablesView.xul (shared/widgets/VariablesView.xul)
-    content/browser/devtools/markup-view.xhtml    (markupview/markup-view.xhtml)
-    content/browser/devtools/markup-view.css      (markupview/markup-view.css)
-    content/browser/devtools/netmonitor.xul           (netmonitor/netmonitor.xul)
-    content/browser/devtools/netmonitor.css           (netmonitor/netmonitor.css)
-    content/browser/devtools/netmonitor-controller.js (netmonitor/netmonitor-controller.js)
-    content/browser/devtools/netmonitor-view.js       (netmonitor/netmonitor-view.js)
-    content/browser/NetworkPanel.xhtml            (webconsole/NetworkPanel.xhtml)
-    content/browser/devtools/webconsole.js        (webconsole/webconsole.js)
-    content/browser/devtools/webconsole.xul       (webconsole/webconsole.xul)
-*   content/browser/scratchpad.xul                (scratchpad/scratchpad.xul)
-    content/browser/scratchpad.js                 (scratchpad/scratchpad.js)
-    content/browser/splitview.css                 (shared/splitview.css)
-    content/browser/devtools/theme-switching.js   (shared/theme-switching.js)
-    content/browser/styleeditor.xul               (styleeditor/styleeditor.xul)
-    content/browser/styleeditor.css               (styleeditor/styleeditor.css)
-    content/browser/devtools/computedview.xhtml   (styleinspector/computedview.xhtml)
-    content/browser/devtools/cssruleview.xhtml    (styleinspector/cssruleview.xhtml)
-    content/browser/devtools/ruleview.css         (styleinspector/ruleview.css)
-    content/browser/devtools/layoutview/view.js   (layoutview/view.js)
-    content/browser/devtools/layoutview/view.xhtml  (layoutview/view.xhtml)
-    content/browser/devtools/layoutview/view.css  (layoutview/view.css)
-    content/browser/devtools/fontinspector/font-inspector.js    (fontinspector/font-inspector.js)
-    content/browser/devtools/fontinspector/font-inspector.xhtml (fontinspector/font-inspector.xhtml)
-    content/browser/devtools/fontinspector/font-inspector.css   (fontinspector/font-inspector.css)
-    content/browser/orion.js                      (sourceeditor/orion/orion.js)
-*   content/browser/source-editor-overlay.xul     (sourceeditor/source-editor-overlay.xul)
-    content/browser/debugger.xul                  (debugger/debugger.xul)
-    content/browser/debugger.css                  (debugger/debugger.css)
-    content/browser/debugger-controller.js        (debugger/debugger-controller.js)
-    content/browser/debugger-view.js              (debugger/debugger-view.js)
-    content/browser/debugger-toolbar.js           (debugger/debugger-toolbar.js)
-    content/browser/debugger-panes.js             (debugger/debugger-panes.js)
-    content/browser/profiler.xul                  (profiler/profiler.xul)
-    content/browser/devtools/cleopatra.html       (profiler/cleopatra/cleopatra.html)
-    content/browser/devtools/profiler/cleopatra/css/ui.css              (profiler/cleopatra/css/ui.css)
-    content/browser/devtools/profiler/cleopatra/css/tree.css            (profiler/cleopatra/css/tree.css)
-    content/browser/devtools/profiler/cleopatra/css/devtools.css        (profiler/cleopatra/css/devtools.css)
-    content/browser/devtools/profiler/cleopatra/js/strings.js           (profiler/cleopatra/js/strings.js)
-    content/browser/devtools/profiler/cleopatra/js/parser.js            (profiler/cleopatra/js/parser.js)
-    content/browser/devtools/profiler/cleopatra/js/parserWorker.js      (profiler/cleopatra/js/parserWorker.js)
-    content/browser/devtools/profiler/cleopatra/js/tree.js              (profiler/cleopatra/js/tree.js)
-    content/browser/devtools/profiler/cleopatra/js/ui.js                (profiler/cleopatra/js/ui.js)
-    content/browser/devtools/profiler/cleopatra/js/ProgressReporter.js  (profiler/cleopatra/js/ProgressReporter.js)
-    content/browser/devtools/profiler/cleopatra/js/devtools.js          (profiler/cleopatra/js/devtools.js)
-    content/browser/devtools/profiler/cleopatra/images/circlearrow.svg  (profiler/cleopatra/images/circlearrow.svg)
-    content/browser/devtools/profiler/cleopatra/images/noise.png        (profiler/cleopatra/images/noise.png)
-    content/browser/devtools/profiler/cleopatra/images/throbber.svg     (profiler/cleopatra/images/throbber.svg)
-    content/browser/devtools/profiler/cleopatra/images/treetwisty.svg   (profiler/cleopatra/images/treetwisty.svg)
-    content/browser/devtools/commandline.css      (commandline/commandline.css)
-    content/browser/devtools/commandlineoutput.xhtml  (commandline/commandlineoutput.xhtml)
-    content/browser/devtools/commandlinetooltip.xhtml  (commandline/commandlinetooltip.xhtml)
-    content/browser/devtools/framework/toolbox-window.xul    (framework/toolbox-window.xul)
-    content/browser/devtools/framework/toolbox-options.xul   (framework/toolbox-options.xul)
-    content/browser/devtools/framework/toolbox-options.js    (framework/toolbox-options.js)
-*   content/browser/devtools/framework/toolbox.xul           (framework/toolbox.xul)
-    content/browser/devtools/framework/toolbox.css           (framework/toolbox.css)
-    content/browser/devtools/inspector/inspector.xul         (inspector/inspector.xul)
-    content/browser/devtools/inspector/inspector.css         (inspector/inspector.css)
-    content/browser/devtools/connect.xhtml  (framework/connect/connect.xhtml)
-    content/browser/devtools/connect.css    (framework/connect/connect.css)
-    content/browser/devtools/connect.js     (framework/connect/connect.js)
+    content/browser/devtools/widgets.css                               (shared/widgets/widgets.css)
+    content/browser/devtools/widgets/VariablesView.xul                 (shared/widgets/VariablesView.xul)
+    content/browser/devtools/markup-view.xhtml                         (markupview/markup-view.xhtml)
+    content/browser/devtools/markup-view.css                           (markupview/markup-view.css)
+    content/browser/devtools/netmonitor.xul                            (netmonitor/netmonitor.xul)
+    content/browser/devtools/netmonitor.css                            (netmonitor/netmonitor.css)
+    content/browser/devtools/netmonitor-controller.js                  (netmonitor/netmonitor-controller.js)
+    content/browser/devtools/netmonitor-view.js                        (netmonitor/netmonitor-view.js)
+    content/browser/devtools/NetworkPanel.xhtml                        (webconsole/NetworkPanel.xhtml)
+    content/browser/devtools/webconsole.js                             (webconsole/webconsole.js)
+    content/browser/devtools/webconsole.xul                            (webconsole/webconsole.xul)
+*   content/browser/devtools/scratchpad.xul                            (scratchpad/scratchpad.xul)
+    content/browser/devtools/scratchpad.js                             (scratchpad/scratchpad.js)
+    content/browser/devtools/splitview.css                             (shared/splitview.css)
+    content/browser/devtools/theme-switching.js                        (shared/theme-switching.js)
+    content/browser/devtools/styleeditor.xul                           (styleeditor/styleeditor.xul)
+    content/browser/devtools/styleeditor.css                           (styleeditor/styleeditor.css)
+    content/browser/devtools/computedview.xhtml                        (styleinspector/computedview.xhtml)
+    content/browser/devtools/cssruleview.xhtml                         (styleinspector/cssruleview.xhtml)
+    content/browser/devtools/ruleview.css                              (styleinspector/ruleview.css)
+    content/browser/devtools/layoutview/view.js                        (layoutview/view.js)
+    content/browser/devtools/layoutview/view.xhtml                     (layoutview/view.xhtml)
+    content/browser/devtools/layoutview/view.css                       (layoutview/view.css)
+    content/browser/devtools/fontinspector/font-inspector.js           (fontinspector/font-inspector.js)
+    content/browser/devtools/fontinspector/font-inspector.xhtml        (fontinspector/font-inspector.xhtml)
+    content/browser/devtools/fontinspector/font-inspector.css          (fontinspector/font-inspector.css)
+    content/browser/devtools/orion.js                                  (sourceeditor/orion/orion.js)
+*   content/browser/devtools/source-editor-overlay.xul                 (sourceeditor/source-editor-overlay.xul)
+    content/browser/devtools/debugger.xul                              (debugger/debugger.xul)
+    content/browser/devtools/debugger.css                              (debugger/debugger.css)
+    content/browser/devtools/debugger-controller.js                    (debugger/debugger-controller.js)
+    content/browser/devtools/debugger-view.js                          (debugger/debugger-view.js)
+    content/browser/devtools/debugger-toolbar.js                       (debugger/debugger-toolbar.js)
+    content/browser/devtools/debugger-panes.js                         (debugger/debugger-panes.js)
+    content/browser/devtools/profiler.xul                              (profiler/profiler.xul)
+    content/browser/devtools/cleopatra.html                            (profiler/cleopatra/cleopatra.html)
+    content/browser/devtools/profiler/cleopatra/css/ui.css             (profiler/cleopatra/css/ui.css)
+    content/browser/devtools/profiler/cleopatra/css/tree.css           (profiler/cleopatra/css/tree.css)
+    content/browser/devtools/profiler/cleopatra/css/devtools.css       (profiler/cleopatra/css/devtools.css)
+    content/browser/devtools/profiler/cleopatra/js/strings.js          (profiler/cleopatra/js/strings.js)
+    content/browser/devtools/profiler/cleopatra/js/parser.js           (profiler/cleopatra/js/parser.js)
+    content/browser/devtools/profiler/cleopatra/js/parserWorker.js     (profiler/cleopatra/js/parserWorker.js)
+    content/browser/devtools/profiler/cleopatra/js/tree.js             (profiler/cleopatra/js/tree.js)
+    content/browser/devtools/profiler/cleopatra/js/ui.js               (profiler/cleopatra/js/ui.js)
+    content/browser/devtools/profiler/cleopatra/js/ProgressReporter.js (profiler/cleopatra/js/ProgressReporter.js)
+    content/browser/devtools/profiler/cleopatra/js/devtools.js         (profiler/cleopatra/js/devtools.js)
+    content/browser/devtools/profiler/cleopatra/images/circlearrow.svg (profiler/cleopatra/images/circlearrow.svg)
+    content/browser/devtools/profiler/cleopatra/images/noise.png       (profiler/cleopatra/images/noise.png)
+    content/browser/devtools/profiler/cleopatra/images/throbber.svg    (profiler/cleopatra/images/throbber.svg)
+    content/browser/devtools/profiler/cleopatra/images/treetwisty.svg  (profiler/cleopatra/images/treetwisty.svg)
+    content/browser/devtools/commandline.css                           (commandline/commandline.css)
+    content/browser/devtools/commandlineoutput.xhtml                   (commandline/commandlineoutput.xhtml)
+    content/browser/devtools/commandlinetooltip.xhtml                  (commandline/commandlinetooltip.xhtml)
+    content/browser/devtools/framework/toolbox-window.xul              (framework/toolbox-window.xul)
+    content/browser/devtools/framework/toolbox-options.xul             (framework/toolbox-options.xul)
+    content/browser/devtools/framework/toolbox-options.js              (framework/toolbox-options.js)
+*   content/browser/devtools/framework/toolbox.xul                     (framework/toolbox.xul)
+    content/browser/devtools/framework/toolbox.css                     (framework/toolbox.css)
+    content/browser/devtools/inspector/inspector.xul                   (inspector/inspector.xul)
+    content/browser/devtools/inspector/inspector.css                   (inspector/inspector.css)
+    content/browser/devtools/connect.xhtml                             (framework/connect/connect.xhtml)
+    content/browser/devtools/connect.css                               (framework/connect/connect.css)
+    content/browser/devtools/connect.js                                (framework/connect/connect.js)
--- a/browser/devtools/main.js
+++ b/browser/devtools/main.js
@@ -77,17 +77,17 @@ Tools.webConsole = {
 Tools.jsdebugger = {
   id: "jsdebugger",
   key: l10n("open.commandkey", debuggerStrings),
   accesskey: l10n("debuggerMenu.accesskey", debuggerStrings),
   modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
   ordinal: 2,
   killswitch: "devtools.debugger.enabled",
   icon: "chrome://browser/skin/devtools/tool-debugger.png",
-  url: "chrome://browser/content/debugger.xul",
+  url: "chrome://browser/content/devtools/debugger.xul",
   label: l10n("ToolboxDebugger.label", debuggerStrings),
   tooltip: l10n("ToolboxDebugger.tooltip", debuggerStrings),
 
   isTargetSupported: function(target) {
     return true;
   },
 
   build: function(iframeWindow, toolbox) {
@@ -119,17 +119,17 @@ Tools.inspector = {
 
 Tools.styleEditor = {
   id: "styleeditor",
   key: l10n("open.commandkey", styleEditorStrings),
   ordinal: 3,
   accesskey: l10n("open.accesskey", styleEditorStrings),
   modifiers: "shift",
   icon: "chrome://browser/skin/devtools/tool-styleeditor.png",
-  url: "chrome://browser/content/styleeditor.xul",
+  url: "chrome://browser/content/devtools/styleeditor.xul",
   label: l10n("ToolboxStyleEditor.label", styleEditorStrings),
   tooltip: l10n("ToolboxStyleEditor.tooltip", styleEditorStrings),
 
   isTargetSupported: function(target) {
     return true;
   },
 
   build: function(iframeWindow, toolbox) {
@@ -141,17 +141,17 @@ Tools.styleEditor = {
 Tools.jsprofiler = {
   id: "jsprofiler",
   accesskey: l10n("profiler.accesskey", profilerStrings),
   key: l10n("profiler2.commandkey", profilerStrings),
   ordinal: 4,
   modifiers: "shift",
   killswitch: "devtools.profiler.enabled",
   icon: "chrome://browser/skin/devtools/tool-profiler.png",
-  url: "chrome://browser/content/profiler.xul",
+  url: "chrome://browser/content/devtools/profiler.xul",
   label: l10n("profiler.label", profilerStrings),
   tooltip: l10n("profiler.tooltip", profilerStrings),
 
   isTargetSupported: function (target) {
     return true;
   },
 
   build: function (frame, target) {
--- a/browser/devtools/profiler/ProfilerPanel.jsm
+++ b/browser/devtools/profiler/ProfilerPanel.jsm
@@ -56,17 +56,17 @@ function ProfileUI(uid, name, panel) {
 
   this.panel = panel;
   this.uid = uid;
   this.name = name;
 
   this.iframe = doc.createElement("iframe");
   this.iframe.setAttribute("flex", "1");
   this.iframe.setAttribute("id", "profiler-cleo-" + uid);
-  this.iframe.setAttribute("src", "devtools/cleopatra.html?" + uid);
+  this.iframe.setAttribute("src", "cleopatra.html?" + uid);
   this.iframe.setAttribute("hidden", "true");
 
   // Append our iframe and subscribe to postMessage events.
   // They'll tell us when the underlying page is done loading
   // or when user clicks on start/stop buttons.
 
   doc.getElementById("profiler-report").appendChild(this.iframe);
   win.addEventListener("message", function (event) {
--- a/browser/devtools/profiler/profiler.xul
+++ b/browser/devtools/profiler/profiler.xul
@@ -3,17 +3,17 @@
 <!-- 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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/common.css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/splitview.css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/profiler.css"?>
-<?xml-stylesheet href="chrome://browser/content/splitview.css"?>
+<?xml-stylesheet href="chrome://browser/content/devtools/splitview.css"?>
 
 <!DOCTYPE window [
 <!ENTITY % profilerDTD SYSTEM "chrome://browser/locale/devtools/profiler.dtd">
   %profilerDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <box flex="1" id="profiler-chrome" class="splitview-root">
--- a/browser/devtools/scratchpad/scratchpad-manager.jsm
+++ b/browser/devtools/scratchpad/scratchpad-manager.jsm
@@ -6,17 +6,17 @@
 "use strict";
 
 this.EXPORTED_SYMBOLS = ["ScratchpadManager"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-const SCRATCHPAD_WINDOW_URL = "chrome://browser/content/scratchpad.xul";
+const SCRATCHPAD_WINDOW_URL = "chrome://browser/content/devtools/scratchpad.xul";
 const SCRATCHPAD_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 /**
  * The ScratchpadManager object opens new Scratchpad windows and manages the state
  * of open scratchpads for session restore. There's only one ScratchpadManager in
  * the life of the browser.
--- a/browser/devtools/scratchpad/scratchpad.xul
+++ b/browser/devtools/scratchpad/scratchpad.xul
@@ -7,30 +7,30 @@
 <!DOCTYPE window [
 <!ENTITY % scratchpadDTD SYSTEM "chrome://browser/locale/devtools/scratchpad.dtd" >
  %scratchpadDTD;
 ]>
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/common.css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/scratchpad.css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
-<?xul-overlay href="chrome://browser/content/source-editor-overlay.xul"?>
+<?xul-overlay href="chrome://browser/content/devtools/source-editor-overlay.xul"?>
 
 <window id="main-window"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&window.title;"
         windowtype="devtools:scratchpad"
         macanimationtype="document"
         fullscreenbutton="true"
         screenX="4" screenY="4"
         width="640" height="480"
         persist="screenX screenY width height sizemode">
 
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="chrome://browser/content/scratchpad.js"/>
+<script type="application/javascript" src="chrome://browser/content/devtools/scratchpad.js"/>
 
 <commandset id="editMenuCommands"/>
 <commandset id="sourceEditorCommands"/>
 
 <commandset id="sp-commandset">
   <command id="sp-cmd-newWindow" oncommand="Scratchpad.openScratchpad();"/>
   <command id="sp-cmd-openFile" oncommand="Scratchpad.openFile();"/>
   <command id="sp-cmd-clearRecentFiles" oncommand="Scratchpad.clearRecentFiles();"/>
--- a/browser/devtools/sourceeditor/source-editor-orion.jsm
+++ b/browser/devtools/sourceeditor/source-editor-orion.jsm
@@ -11,17 +11,17 @@ const Ci = Components.interfaces;
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource:///modules/source-editor-ui.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "clipboardHelper",
                                    "@mozilla.org/widget/clipboardhelper;1",
                                    "nsIClipboardHelper");
 
-const ORION_SCRIPT = "chrome://browser/content/orion.js";
+const ORION_SCRIPT = "chrome://browser/content/devtools/orion.js";
 const ORION_IFRAME = "data:text/html;charset=utf8,<!DOCTYPE html>" +
   "<html style='height:100%' dir='ltr'>" +
   "<head><link rel='stylesheet'" +
   " href='chrome://browser/skin/devtools/orion-container.css'></head>" +
   "<body style='height:100%;margin:0;overflow:hidden'>" +
   "<div id='editor' style='height:100%'></div>" +
   "</body></html>";
 
--- a/browser/devtools/styleeditor/styleeditor.xul
+++ b/browser/devtools/styleeditor/styleeditor.xul
@@ -2,23 +2,23 @@
 <!-- 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/. -->
 <!DOCTYPE window [
 <!ENTITY % styleEditorDTD SYSTEM "chrome://browser/locale/devtools/styleeditor.dtd" >
  %styleEditorDTD;
 ]>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/splitview.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/devtools/splitview.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/splitview.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/styleeditor.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/devtools/styleeditor.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/devtools/styleeditor.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
-<?xul-overlay href="chrome://browser/content/source-editor-overlay.xul"?>
+<?xul-overlay href="chrome://browser/content/devtools/source-editor-overlay.xul"?>
 <xul:window xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns="http://www.w3.org/1999/xhtml"
         id="style-editor-chrome-window">
 
   <xul:script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <xul:popupset id="style-editor-popups">
     <xul:menupopup id="sourceEditorContextMenu"
--- a/browser/devtools/webconsole/NetworkPanel.jsm
+++ b/browser/devtools/webconsole/NetworkPanel.jsm
@@ -57,17 +57,17 @@ function NetworkPanel(aParent, aHttpActi
     titlebar: "normal",
     noautofocus: "true",
     noautohide: "true",
     close: "true"
   });
 
   // Create the iframe that displays the NetworkPanel XHTML.
   this.iframe = createAndAppendElement(this.panel, "iframe", {
-    src: "chrome://browser/content/NetworkPanel.xhtml",
+    src: "chrome://browser/content/devtools/NetworkPanel.xhtml",
     type: "content",
     flex: "1"
   });
 
   let self = this;
 
   // Destroy the panel when it's closed.
   this.panel.addEventListener("popuphidden", function onPopupHide() {