joewalker · bgrins · Dec 1, 2015
diff --git a/client/aboutdebugging/aboutdebugging.xhtml b/client/aboutdebugging/aboutdebugging.xhtml
@@ -12,20 +12,20 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&aboutDebugging.title;</title>
-    <link rel="stylesheet" href="/devtools/client/chrome/global/skin/global.css" type="text/css"/>
+    <link rel="stylesheet" href="/client/chrome/global/skin/global.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
-    <link rel="stylesheet" href="/devtools/client/aboutdebugging/aboutdebugging.css"  type="text/css"/>
-    <script type="application/javascript" src="resource://devtools/client/shared/vendor/react.js"></script>
-    <script type="application/javascript" src="/devtools/client/aboutdebugging/aboutdebugging.js"></script>
+    <link rel="stylesheet" href="/client/aboutdebugging/aboutdebugging.css"  type="text/css"/>
+    <script type="application/javascript" src="resource://client/shared/vendor/react.js"></script>
+    <script type="application/javascript" src="/client/aboutdebugging/aboutdebugging.js"></script>
   </head>
   <body id="body">
     <div id="categories">
       <div class="category" value="addons" selected="true">
-        <img class="category-icon" src="/devtools/client/themes/images/debugging-addons.svg"/>
+        <img class="category-icon" src="/client/themes/images/debugging-addons.svg"/>
         <div class="category-name">&aboutDebugging.addons;</div>
       </div>
       <div class="category" value="workers">
-        <img class="category-icon" src="/devtools/client/themes/images/debugging-workers.svg"/>
+        <img class="category-icon" src="/client/themes/images/debugging-workers.svg"/>
         <div class="category-name">&aboutDebugging.workers;</div>
       </div>
     </div>

diff --git a/client/aboutdebugging/components/addons.js b/client/aboutdebugging/components/addons.js
@@ -12,7 +12,7 @@ const { Services } = require("devtools/sham/services");
 
 const { AddonManager } = require("devtools/sham/addonmanager");
 
-const ExtensionIcon = "/devtools/client/chrome/mozapps/skin/extensions/extensionGeneric.svg";
+const ExtensionIcon = "/client/chrome/mozapps/skin/extensions/extensionGeneric.svg";
 const Strings = Services.strings.createBundle(
   require("l10n/aboutdebugging.properties"));
 

diff --git a/client/aboutdebugging/components/workers.js b/client/aboutdebugging/components/workers.js
@@ -13,7 +13,7 @@ const { Services } = require("devtools/sham/services");
 
 const Strings = Services.strings.createBundle(
   require("l10n/aboutdebugging.properties"));
-const WorkerIcon = "/devtools/client/themes/images/debugging-workers.svg";
+const WorkerIcon = "/client/themes/images/debugging-workers.svg";
 
 exports.WorkersComponent = React.createClass({
   displayName: "WorkersComponent",

diff --git a/client/canvasdebugger/canvasdebugger.xul b/client/canvasdebugger/canvasdebugger.xul
@@ -3,17 +3,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/. -->
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/canvasdebugger.css" type="text/css"?>
+<?xml-stylesheet href="/client/shared/widgets/widgets.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/common.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/widgets.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/canvasdebugger.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % canvasDebuggerDTD SYSTEM "l10n/canvasdebugger.dtd">
   %canvasDebuggerDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="/devtools/client/shared/theme-switching.js"/>
+  <script src="/client/shared/theme-switching.js"/>
   <script type="application/javascript" src="canvasdebugger.js"/>
   <script type="application/javascript" src="callslist.js"/>
   <script type="application/javascript" src="snapshotslist.js"/>

diff --git a/client/debugger/debugger-commands.js b/client/debugger/debugger-commands.js
@@ -7,7 +7,7 @@
 const { Cc, Ci, Cu } = require("chrome");
 const l10n = require("gcli/l10n");
 
-loader.lazyImporter(this, "gDevTools", "resource://devtools/client/framework/gDevTools.jsm");
+loader.lazyImporter(this, "gDevTools", "resource://client/framework/gDevTools.jsm");
 
 /**
  * The commands and converters that are exported to GCLI

diff --git a/client/debugger/debugger-controller.js b/client/debugger/debugger-controller.js
@@ -95,20 +95,20 @@ const FRAME_TYPE = {
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://devtools/shared/event-emitter.js");
-Cu.import("resource://devtools/client/shared/widgets/SimpleListWidget.jsm");
-Cu.import("resource://devtools/client/shared/widgets/BreadcrumbsWidget.jsm");
-Cu.import("resource://devtools/client/shared/widgets/SideMenuWidget.jsm");
-Cu.import("resource://devtools/client/shared/widgets/VariablesView.jsm");
-Cu.import("resource://devtools/client/shared/widgets/VariablesViewController.jsm");
-Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm");
+Cu.import("resource://client/shared/widgets/SimpleListWidget.jsm");
+Cu.import("resource://client/shared/widgets/BreadcrumbsWidget.jsm");
+Cu.import("resource://client/shared/widgets/SideMenuWidget.jsm");
+Cu.import("resource://client/shared/widgets/VariablesView.jsm");
+Cu.import("resource://client/shared/widgets/VariablesViewController.jsm");
+Cu.import("resource://client/shared/widgets/ViewHelpers.jsm");
 
 /**
  * Localization convenience methods.
  */
 var L10N = new ViewHelpers.L10N(DBG_STRINGS_URI);
 
-Cu.import("resource://devtools/client/shared/browser-loader.js");
-const require = BrowserLoader("resource://devtools/client/debugger/", this).require;
+Cu.import("resource://client/shared/browser-loader.js");
+const require = BrowserLoader("resource://client/debugger/", this).require;
 XPCOMUtils.defineConstant(this, "require", require);
 
 // React

diff --git a/client/debugger/debugger-view.js b/client/debugger/debugger-view.js
@@ -29,7 +29,7 @@ const EDITOR_VARIABLE_POPUP_POSITION = "topcenter bottomleft";
 const TOOLBAR_ORDER_POPUP_POSITION = "topcenter bottomleft";
 const RESIZE_REFRESH_RATE = 50; // ms
 const PROMISE_DEBUGGER_URL =
-  "/devtools/client/promisedebugger/promise-debugger.xhtml";
+  "/client/promisedebugger/promise-debugger.xhtml";
 
 const EventListenersView = require('./content/views/event-listeners-view');
 const SourcesView = require('./content/views/sources-view');

diff --git a/client/debugger/debugger.xul b/client/debugger/debugger.xul
@@ -3,11 +3,11 @@
    - 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="/devtools/client/shared/widgets/widgets.css" type="text/css"?>
+<?xml-stylesheet href="/client/shared/widgets/widgets.css" type="text/css"?>
 <?xml-stylesheet href="debugger.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/debugger.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/common.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/widgets.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/debugger.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % debuggerDTD SYSTEM "l10n/debugger.dtd">
   %debuggerDTD;
@@ -23,8 +23,8 @@
         persist="screenX screenY width height sizemode">
 
   <script type="application/javascript"
-          src="/devtools/client/shared/theme-switching.js"/>
-  <script type="text/javascript" src="/devtools/client/chrome/global/content/globalOverlay.js"/>
+          src="/client/shared/theme-switching.js"/>
+  <script type="text/javascript" src="/client/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="utils.js"/>

diff --git a/client/definitions.js b/client/definitions.js
@@ -31,7 +31,7 @@ exports.Tools = Tools;
 Tools.options = {
   id: "options",
   ordinal: 0,
-  url: "/devtools/client/framework/toolbox-options.xul",
+  url: "/client/framework/toolbox-options.xul",
   icon: "../themes/images/tool-options.svg",
   invertIconForLightTheme: true,
   bgTheme: "theme-body",
@@ -128,9 +128,9 @@ Tools.jsdebugger = {
   accesskey: l10n("debuggerMenu.accesskey", debuggerStrings),
   modifiers: osString == "Darwin" ? "accel,alt" : "accel,shift",
   ordinal: 3,
-  icon: "chrome://devtools/skin/images/tool-debugger.svg",
+  icon: "/client/themes/images/tool-debugger.svg",
   invertIconForLightTheme: true,
-  highlightedicon: "chrome://devtools/skin/images/tool-debugger-paused.svg",
+  highlightedicon: "/client/themes/images/tool-debugger-paused.svg",
   url: "../debugger/debugger.xhtml",
   label: l10n("ToolboxDebugger.label", debuggerStrings),
   panelLabel: l10n("ToolboxDebugger.panelLabel", debuggerStrings),

diff --git a/client/eyedropper/eyedropper.js b/client/eyedropper/eyedropper.js
@@ -23,9 +23,9 @@ const XULRuntime = Cc("@mozilla.org/xre/app-info;1")
         .getService(Ci.nsIXULRuntime);
 const l10n = Services.strings.createBundle(require("l10n/eyedropper.properties"));
 
-const EYEDROPPER_URL = "/devtools/client/eyedropper/eyedropper.xul";
-const CROSSHAIRS_URL = "/devtools/client/eyedropper/crosshairs.css";
-const NOCURSOR_URL = "/devtools/client/eyedropper/nocursor.css";
+const EYEDROPPER_URL = "/client/eyedropper/eyedropper.xul";
+const CROSSHAIRS_URL = "/client/eyedropper/crosshairs.css";
+const NOCURSOR_URL = "/client/eyedropper/nocursor.css";
 
 const ZOOM_PREF = "devtools.eyedropper.zoom";
 const FORMAT_PREF = "devtools.defaultColorUnit";
@@ -119,7 +119,7 @@ function Eyedropper(chromeWindow, opts = { copyOnSelect: true, context: "other"
   };
 
   let mm = this._contentTab.linkedBrowser.messageManager;
-  mm.loadFrameScript("resource://devtools/client/eyedropper/eyedropper-child.js", true);
+  mm.loadFrameScript("resource://client/eyedropper/eyedropper-child.js", true);
 
   // record if this was opened via the picker or standalone
   var telemetry = new Telemetry();

diff --git a/client/eyedropper/eyedropper.xul b/client/eyedropper/eyedropper.xul
@@ -6,8 +6,8 @@
 
 <!DOCTYPE window []>
 
-<?xml-stylesheet href="/devtools/client/themes/common.css"?>
-<?xml-stylesheet href="/devtools/client/themes/eyedropper.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/common.css"?>
+<?xml-stylesheet href="/client/themes/eyedropper.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <commandset id="eyedropper-commandset">

diff --git a/client/framework/ToolboxProcess.js b/client/framework/ToolboxProcess.js
@@ -7,7 +7,7 @@
 
 const { Cc, Ci, Cu, Cr } = require("devtools/sham/chrome");
 
-const DBG_XUL = "/devtools/client/framework/toolbox-process-window.xul";
+const DBG_XUL = "/client/framework/toolbox-process-window.xul";
 const CHROME_DEBUGGER_PROFILE_NAME = "chrome_debugger_profile";
 
 const { Services } = require("devtools/sham/services");

diff --git a/client/framework/connect/connect.xhtml b/client/framework/connect/connect.xhtml
@@ -12,8 +12,8 @@
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title>&title;</title>
-    <link rel="stylesheet" href="/devtools/client/themes/dark-theme.css" type="text/css"/>
-    <link rel="stylesheet" href="/devtools/client/framework/connect/connect.css" type="text/css"/>
+    <link rel="stylesheet" href="/client/themes/dark-theme.css" type="text/css"/>
+    <link rel="stylesheet" href="/client/framework/connect/connect.css" type="text/css"/>
     <script type="application/javascript" src="connect.js"></script>
   </head>
   <body>

diff --git a/client/framework/dev-edition-promo/dev-edition-promo.css b/client/framework/dev-edition-promo/dev-edition-promo.css
@@ -48,7 +48,7 @@ window {
 }
 
 #icon {
-  background-image: url("/devtools/client/framework/dev-edition-promo/dev-edition-logo.png");
+  background-image: url("/client/framework/dev-edition-promo/dev-edition-logo.png");
   background-size: 64px 64px;
   background-repeat: no-repeat;
   width: 64px;

diff --git a/client/framework/dev-edition-promo/dev-edition-promo.xul b/client/framework/dev-edition-promo/dev-edition-promo.xul
@@ -7,7 +7,7 @@
  %toolboxDTD;
 ]>
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet rel="stylesheet" href="/devtools/client/framework/dev-edition-promo/dev-edition-promo.css" type="text/css"?>
+<?xml-stylesheet rel="stylesheet" href="/client/framework/dev-edition-promo/dev-edition-promo.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" id="dev-edition-promo">
   <vbox id="doorhanger-container">

diff --git a/client/framework/gDevTools.js b/client/framework/gDevTools.js
@@ -679,7 +679,7 @@ var gDevToolsBrowser = {
    * Open a tab to allow connects to a remote browser
    */
   openConnectScreen: function(gBrowser) {
-    gBrowser.selectedTab = gBrowser.addTab("/devtools/client/framework/connect/connect.xhtml");
+    gBrowser.selectedTab = gBrowser.addTab("/client/framework/connect/connect.xhtml");
   },
 
   /**
@@ -690,7 +690,7 @@ var gDevToolsBrowser = {
     if (win) {
       win.focus();
     } else {
-      Services.ww.openWindow(null, "/devtools/client/webide/content/", "webide", "chrome,centerscreen,resizable", null);
+      Services.ww.openWindow(null, "/client/webide/content/", "webide", "chrome,centerscreen,resizable", null);
     }
   },
 

diff --git a/client/framework/toolbox-hosts.js b/client/framework/toolbox-hosts.js
@@ -278,7 +278,7 @@ function WindowHost() {
 WindowHost.prototype = {
   type: "window",
 
-  WINDOW_URL: "/devtools/client/framework/toolbox-window.xul",
+  WINDOW_URL: "/client/framework/toolbox-window.xul",
 
   /**
    * Create a new xul window to contain the toolbox.

diff --git a/client/framework/toolbox-options.xul b/client/framework/toolbox-options.xul
@@ -7,12 +7,12 @@
  %toolboxDTD;
 ]>
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet rel="stylesheet" href="/devtools/client/framework/options-panel.css" type="text/css"?>
+<?xml-stylesheet rel="stylesheet" href="/client/framework/options-panel.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript"
-          src="/devtools/client/shared/theme-switching.js"/>
+          src="/client/shared/theme-switching.js"/>
   <hbox id="options-panel-container" flex="1">
     <hbox id="options-panel" class="theme-body" flex="1">
       <vbox id="tools-box" class="options-vertical-pane" flex="1">

diff --git a/client/framework/toolbox-process-window.xul b/client/framework/toolbox-process-window.xul
@@ -17,7 +17,7 @@
         width="900" height="600"
         persist="screenX screenY width height sizemode">
 
-  <script type="text/javascript" src="/devtools/client/chrome/global/content/globalOverlay.js"/>
+  <script type="text/javascript" src="/client/chrome/global/content/globalOverlay.js"/>
   <script type="text/javascript" src="toolbox-process-window.js"/>
   <script type="text/javascript" src="chrome://global/content/viewSourceUtils.js"/>
   <script type="text/javascript" src="chrome://browser/content/utilityOverlay.js"/>

diff --git a/client/framework/toolbox.xhtml b/client/framework/toolbox.xhtml
@@ -2,8 +2,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="/devtools/client/chrome/global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/common.css" type="text/css"?>
+<?xml-stylesheet href="/client/chrome/global/skin/global.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/common.css" type="text/css"?>
 
 <!-- DOCTYPE window [
 <!ENTITY % toolboxDTD SYSTEM "l10n/toolbox.dtd" >
@@ -23,7 +23,7 @@
   <script type="application/javascript"
           src="../shared/theme-switching.js"/>
 
-  <script type="application/javascript" src="/devtools/client/chrome/global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="/client/chrome/global/content/globalOverlay.js"/>
 
   <commandset id="editMenuCommands"/>
   <keyset id="editMenuKeys"/>

diff --git a/client/framework/toolbox.xul b/client/framework/toolbox.xul
@@ -23,7 +23,7 @@
   <script type="application/javascript"
           src="chrome://global/content/viewSourceUtils.js"/>
 
-  <script type="application/javascript" src="/devtools/client/chrome/global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="/client/chrome/global/content/globalOverlay.js"/>
 
   <commandset id="editMenuCommands"/>
   <keyset id="editMenuKeys"/>

diff --git a/client/inspector/inspector.xul b/client/inspector/inspector.xul
@@ -3,11 +3,11 @@
    - 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="/devtools/client/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/inspector/inspector.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/common.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/widgets.css" type="text/css"?>
-<?xml-stylesheet href="/devtools/client/themes/inspector.css" type="text/css"?>
+<?xml-stylesheet href="/client/shared/widgets/widgets.css" type="text/css"?>
+<?xml-stylesheet href="/client/inspector/inspector.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/common.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/widgets.css" type="text/css"?>
+<?xml-stylesheet href="/client/themes/inspector.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % inspectorDTD SYSTEM "l10n/inspector.dtd" >
    %inspectorDTD;
@@ -16,7 +16,7 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript"
-          src="/devtools/client/shared/theme-switching.js"/>
+          src="/client/shared/theme-switching.js"/>
 
   <commandset>
     <command id="nodeSearchCommand"

diff --git a/client/jsonview/converter-child.js b/client/jsonview/converter-child.js
@@ -196,7 +196,7 @@ var Converter = Class({
 
   toHTML: function(json, headers, title) {
     var themeClassName = "theme-" + JsonViewUtils.getCurrentTheme();
-    var clientBaseUrl = "resource://devtools/client/";
+    var clientBaseUrl = "resource://client/";
     var baseUrl = clientBaseUrl + "jsonview/";
     var themeVarsUrl = clientBaseUrl + "themes/variables.css";
 

diff --git a/client/jsonview/css/search-box.css b/client/jsonview/css/search-box.css
@@ -26,7 +26,7 @@
 .theme-dark .searchBox,
 .theme-light .searchBox {
   border: 1px solid rgb(170, 170, 170);
-  background-image: url("/devtools/client/themes/images/magnifying-glass-light.png");
+  background-image: url("/client/themes/images/magnifying-glass-light.png");
   background-position: 8px center;
   border-radius: 2px;
   padding-left: 25px;
@@ -42,5 +42,5 @@
   background-color: rgba(24, 29, 32, 1);
   color: rgba(184, 200, 217, 1);
   border-color: var(--theme-splitter-color);
-  background-image: url("/devtools/client/themes/images/magnifying-glass.png");
+  background-image: url("/client/themes/images/magnifying-glass.png");
 }
diff --git a/client/jsonview/main.js b/client/jsonview/main.js
@@ -25,7 +25,7 @@ var JsonView = {
     // them into a simple web-app that allows easy inspection
     // of the JSON data.
     Services.ppmm.loadProcessScript(
-      "resource://devtools/client/jsonview/converter-observer.js",
+      "resource://client/jsonview/converter-observer.js",
       true);
 
     this.onSaveListener = this.onSave.bind(this);

diff --git a/client/jsonview/viewer-config.js b/client/jsonview/viewer-config.js
@@ -21,10 +21,10 @@ require.config({
   baseUrl: ".",
   paths: {
     "react": [
-      "resource://devtools/client/shared/vendor/react-dev",
-      "resource://devtools/client/shared/vendor/react"
+      "resource://client/shared/vendor/react-dev",
+      "resource://client/shared/vendor/react"
     ],
-    "react-dom": "resource://devtools/client/shared/vendor/react-dom"
+    "react-dom": "resource://client/shared/vendor/react-dom"
   }
 });
 

diff --git a/client/memory/initializer.js b/client/memory/initializer.js
@@ -7,7 +7,7 @@
 const { Cc, Ci, Cu, Cr } = require("devtools/sham/chrome");
 
 //const { BrowserLoader } = require("devtools/client/shared/browser-loader");
-//const { require } = BrowserLoader("resource://devtools/client/memory/", this);
+//const { require } = BrowserLoader("resource://client/memory/", this);
 const { Task } = require("devtools/sham/task");
 const { createFactory, createElement } = require("devtools/client/shared/vendor/react");
 const ReactDOM = require("devtools/client/shared/vendor/react-dom");