Bug 1356033 - chrome://browser/content/gcli_sec_{bad,good,moderate}.svg should be moved to devtools r=jdescottes
☠☠ backed out by 410b3a625af7 ☠ ☠
authorMichael Ratcliffe <mratcliffe@mozilla.com>
Thu, 04 May 2017 14:41:36 +0100
changeset 356594 2febf984044a9332f7f66b000b59d2dcee0b5515
parent 356593 9316a48f009b758bc1f0fb76093c2cc9916eb5dd
child 356595 fd0dc297282a2fd83a4790a9e50e068640dac665
push id31767
push usercbook@mozilla.com
push dateFri, 05 May 2017 13:15:58 +0000
treeherdermozilla-central@8872ad4d52b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdescottes
bugs1356033
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1356033 - chrome://browser/content/gcli_sec_{bad,good,moderate}.svg should be moved to devtools r=jdescottes This is easy to test: Green tick marks (gcli_sec_good.svg) and Red Crosses (gcli_sec_bad.svg): 1. Go to https://csp-evaluator.withgoogle.com/ 2. Shift+F2 3. security csp I couldn't find a way to show the Orange Minus (gcli_sec_moderate.svg) but the path is changed in line with the other images and I did test it programatically so it will be fine. MozReview-Commit-ID: 5897IV7epax
browser/base/content/gcli_sec_bad.svg
browser/base/content/gcli_sec_good.svg
browser/base/content/gcli_sec_moderate.svg
browser/base/jar.mn
devtools/client/jar.mn
devtools/client/themes/images/gcli_sec_bad.svg
devtools/client/themes/images/gcli_sec_good.svg
devtools/client/themes/images/gcli_sec_moderate.svg
devtools/shared/gcli/commands/security.js
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -112,19 +112,16 @@ browser.jar:
         content/browser/defaultthemes/4.preview.png   (content/defaultthemes/4.preview.png)
         content/browser/defaultthemes/5.footer.png    (content/defaultthemes/5.footer.png)
         content/browser/defaultthemes/5.header.png    (content/defaultthemes/5.header.png)
         content/browser/defaultthemes/5.icon.jpg      (content/defaultthemes/5.icon.jpg)
         content/browser/defaultthemes/5.preview.jpg   (content/defaultthemes/5.preview.jpg)
         content/browser/defaultthemes/compact.header.png    (content/defaultthemes/compact.header.png)
         content/browser/defaultthemes/compactdark.icon.svg  (content/defaultthemes/compactdark.icon.svg)
         content/browser/defaultthemes/compactlight.icon.svg (content/defaultthemes/compactlight.icon.svg)
-        content/browser/gcli_sec_bad.svg              (content/gcli_sec_bad.svg)
-        content/browser/gcli_sec_good.svg             (content/gcli_sec_good.svg)
-        content/browser/gcli_sec_moderate.svg         (content/gcli_sec_moderate.svg)
         content/browser/newtab/newTab.xhtml           (content/newtab/newTab.xhtml)
 *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
         content/browser/newtab/newTab.inadjacent.json         (content/newtab/newTab.inadjacent.json)
         content/browser/newtab/alternativeDefaultSites.json   (content/newtab/alternativeDefaultSites.json)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
         content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
         content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -207,16 +207,19 @@ devtools.jar:
     skin/images/dock-undock.svg (themes/images/dock-undock.svg)
     skin/floating-scrollbars-dark-theme.css (themes/floating-scrollbars-dark-theme.css)
     skin/floating-scrollbars-responsive-design.css (themes/floating-scrollbars-responsive-design.css)
     skin/inspector.css (themes/inspector.css)
     skin/images/profiler-stopwatch.svg (themes/images/profiler-stopwatch.svg)
     skin/images/debugging-addons.svg (themes/images/debugging-addons.svg)
     skin/images/debugging-tabs.svg (themes/images/debugging-tabs.svg)
     skin/images/debugging-workers.svg (themes/images/debugging-workers.svg)
+    skin/images/gcli_sec_bad.svg (themes/images/gcli_sec_bad.svg)
+    skin/images/gcli_sec_good.svg (themes/images/gcli_sec_good.svg)
+    skin/images/gcli_sec_moderate.svg (themes/images/gcli_sec_moderate.svg)
     skin/images/globe.svg (themes/images/globe.svg)
     skin/images/tool-options.svg (themes/images/tool-options.svg)
     skin/images/tool-webconsole.svg (themes/images/tool-webconsole.svg)
     skin/images/tool-canvas.svg (themes/images/tool-canvas.svg)
     skin/images/tool-debugger.svg (themes/images/tool-debugger.svg)
     skin/images/tool-debugger-paused.svg (themes/images/tool-debugger-paused.svg)
     skin/images/tool-inspector.svg (themes/images/tool-inspector.svg)
     skin/images/tool-shadereditor.svg (themes/images/tool-shadereditor.svg)
rename from browser/base/content/gcli_sec_bad.svg
rename to devtools/client/themes/images/gcli_sec_bad.svg
rename from browser/base/content/gcli_sec_good.svg
rename to devtools/client/themes/images/gcli_sec_good.svg
rename from browser/base/content/gcli_sec_moderate.svg
rename to devtools/client/themes/images/gcli_sec_moderate.svg
--- a/devtools/shared/gcli/commands/security.js
+++ b/devtools/shared/gcli/commands/security.js
@@ -11,19 +11,19 @@
  *    Provides information about the current referrer policy
  */
 
 "use strict";
 
 const { Ci } = require("chrome");
 const l10n = require("gcli/l10n");
 
-const GOOD_IMG_SRC = "chrome://browser/content/gcli_sec_good.svg";
-const MOD_IMG_SRC = "chrome://browser/content/gcli_sec_moderate.svg";
-const BAD_IMG_SRC = "chrome://browser/content/gcli_sec_bad.svg";
+const GOOD_IMG_SRC = "chrome://devtools/skin/images/gcli_sec_good.svg";
+const MOD_IMG_SRC = "chrome://devtools/skin/images/gcli_sec_moderate.svg";
+const BAD_IMG_SRC = "chrome://devtools/skin/images/gcli_sec_bad.svg";
 
 // special handling within policy
 const POLICY_REPORT_ONLY = "report-only";
 
 // special handling of directives
 const DIR_UPGRADE_INSECURE = "upgrade-insecure-requests";
 const DIR_BLOCK_ALL_MIXED_CONTENT = "block-all-mixed-content";
 
@@ -148,17 +148,17 @@ exports.items = [
     exec: function (cspInfo, context) {
       const url = context.environment.target.url;
 
       if (cspInfo.length == 0) {
         return context.createView({
           html:
             "<table class='gcli-csp-detail' cellspacing='10' valign='top'>" +
             "  <tr>" +
-            "    <td> <img src='chrome://browser/content/gcli_sec_bad.svg' width='20px' /> </td> " +
+            "    <td> <img src='" + BAD_IMG_SRC + "' width='20px' /> </td> " +
             "    <td>" + NO_CSP_ON_PAGE_MSG + " <b>" + url + "</b></td>" +
             "  </tr>" +
             "</table>"});
       }
 
       /* eslint-disable max-len */
       return context.createView({
         html: