Backed out changeset 7d53ab517f06 (bug 1719492) for causing bc failures at browser_all_files_referenced.js

browser/base/content/test/static/browser_all_files_referenced.js

@@ -55,10 +55,6 @@ var gExceptionPaths = [
   // Paths from this folder are constructed in NetErrorParent.jsm based on
   // the type of cert or net error the user is encountering.
   "chrome://browser/content/certerror/supportpages/",
-
-  // Exclude all screenshots files that have been moved out of the extension to
-  // browser/component, see bug 1696573.
-  "resource://app/features/screenshots",
 ];
 
 // These are not part of the omni.ja file, so we find them only when running

browser/components/screenshots/jar.mn

@@ -3,12 +3,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-        content/browser/screenshots/cancel.svg                         (content/cancel.svg)
-        content/browser/screenshots/copied-notification.svg            (content/copied-notification.svg)
-        content/browser/screenshots/copy.svg                           (content/copy.svg)
-        content/browser/screenshots/download-white.svg                 (content/download-white.svg)
-        content/browser/screenshots/download.svg                       (content/download.svg)
-        content/browser/screenshots/icon-welcome-face-without-eyes.svg (content/icon-welcome-face-without-eyes.svg)
-        content/browser/screenshots/menu-fullpage.svg                  (content/menu-fullpage.svg)
-        content/browser/screenshots/menu-visible.svg                   (content/menu-visible.svg)
-        content/browser/screenshots/screenshots.js                     (content/screenshots.js)
+        content/browser/screenshots/screenshots.js                  (content/screenshots.js)

browser/extensions/screenshots/background/main.js

@@ -170,7 +170,7 @@ this.main = (function() {
       ]);
       return browser.notifications.create(id, {
         type: "basic",
-        iconUrl: "chrome://browser/content/screenshots/copied-notification.svg",
+        iconUrl: "../icons/copied-notification.svg",
         title,
         message,
       });
@@ -209,7 +209,7 @@ this.main = (function() {
     catcher.watchPromise(incrementCount("copy"));
     return browser.notifications.create({
       type: "basic",
-      iconUrl: "chrome://browser/content/screenshots/copied-notification.svg",
+      iconUrl: "../icons/copied-notification.svg",
       title,
       message,
     });

browser/extensions/screenshots/build/inlineSelectionCss.js

@@ -73,7 +73,7 @@ window.inlineSelectionCss = `
     margin-inline-end: 10px;
     transition: background-color 150ms cubic-bezier(0.07, 0.95, 0, 1); }
   .button.download, .download.highlight-button-cancel, .download.highlight-button-download, .download.highlight-button-copy {
-    background-image: url("chrome://browser/content/screenshots/download.svg"); }
+    background-image: url("../img/icon-download.svg"); }
     .button.download:hover, .download.highlight-button-cancel:hover, .download.highlight-button-download:hover, .download.highlight-button-copy:hover {
       background-color: #ededf0; }
     .button.download:active, .download.highlight-button-cancel:active, .download.highlight-button-download:active, .download.highlight-button-copy:active {
@@ -544,7 +544,7 @@ window.inlineSelectionCss = `
   width: 62.4px;
   height: 62.4px;
   display: block;
-  background-image: url("chrome://browser/content/screenshots/icon-welcome-face-without-eyes.svg"); }
+  background-image: url("MOZ_EXTENSION/icons/icon-welcome-face-without-eyes.svg"); }
 
 .eye {
   background-color: #fff;
@@ -644,9 +644,9 @@ window.inlineSelectionCss = `
       background-color: #dedede;
       border: 1px solid #989898; }
   .all-buttons-container .full-page {
-    background-image: url("chrome://browser/content/screenshots/menu-fullpage.svg"); }
+    background-image: url("MOZ_EXTENSION/icons/menu-fullpage.svg"); }
   .all-buttons-container .visible {
-    background-image: url("chrome://browser/content/screenshots/menu-visible.svg"); }
+    background-image: url("MOZ_EXTENSION/icons/menu-visible.svg"); }
 
 @keyframes pulse {
   0% {

browser/extensions/screenshots/manifest.json

@@ -38,7 +38,14 @@
     }
   ],
   "web_accessible_resources": [
-    "blank.html"
+    "blank.html",
+    "icons/cancel.svg",
+    "icons/download.svg",
+    "icons/copy.svg",
+    "icons/icon-256.png",
+    "icons/menu-fullpage.svg",
+    "icons/menu-visible.svg",
+    "icons/icon-welcome-face-without-eyes.svg"
   ],
   "permissions": [
     "activeTab",

browser/extensions/screenshots/moz.build

@@ -49,6 +49,17 @@ FINAL_TARGET_FILES.features["screenshots@mozilla.org"]["experiments"][
     "screenshots"
 ] += ["experiments/screenshots/api.js", "experiments/screenshots/schema.json"]
 
+FINAL_TARGET_FILES.features["screenshots@mozilla.org"]["icons"] += [
+    "icons/cancel.svg",
+    "icons/copied-notification.svg",
+    "icons/copy.svg",
+    "icons/download-white.svg",
+    "icons/download.svg",
+    "icons/icon-welcome-face-without-eyes.svg",
+    "icons/menu-fullpage.svg",
+    "icons/menu-visible.svg",
+]
+
 FINAL_TARGET_FILES.features["screenshots@mozilla.org"]["selector"] += [
     "selector/callBackground.js",
     "selector/documentMetadata.js",

browser/extensions/screenshots/selector/ui.js

@@ -411,14 +411,20 @@ this.ui = (function() {
                     <div class="preview-image">
                       <div class="preview-buttons">
                         <button class="highlight-button-cancel" title="${cancelTitle}">
-                          <img src="chrome://browser/content/screenshots/cancel.svg"/>
+                          <img src="${browser.runtime.getURL(
+                            "icons/cancel.svg"
+                          )}" />
                         </button>
                         <button class="highlight-button-copy" title="${copyTitle}">
-                          <img src="chrome://browser/content/screenshots/copy.svg"/>
+                          <img src="${browser.runtime.getURL(
+                            "icons/copy.svg"
+                          )}" />
                           <span data-l10n-id="screenshots-copy-button"/>
                         </button>
                         <button class="highlight-button-download" title="${downloadTitle}">
-                          <img src="chrome://browser/content/screenshots/download-white.svg"/>
+                          <img src="${browser.runtime.getURL(
+                            "icons/download-white.svg"
+                          )}" />
                           <span data-l10n-id="screenshots-download-button"/>
                       </button>
                     </div>
@@ -725,7 +731,7 @@ this.ui = (function() {
       const buttons = makeEl("div", "highlight-buttons");
       const cancel = makeEl("button", "highlight-button-cancel");
       const cancelImg = makeEl("img");
-      cancelImg.src = "chrome://browser/content/screenshots/cancel.svg";
+      cancelImg.src = browser.runtime.getURL("icons/cancel.svg");
       cancel.title = cancelTitle;
       cancel.appendChild(cancelImg);
       buttons.appendChild(cancel);
@@ -735,15 +741,14 @@ this.ui = (function() {
       const copyImg = makeEl("img");
       const copyString = makeEl("span");
       copyString.textContent = copyText;
-      copyImg.src = "chrome://browser/content/screenshots/copy.svg";
+      copyImg.src = browser.runtime.getURL("icons/copy.svg");
       copy.appendChild(copyImg);
       copy.appendChild(copyString);
       buttons.appendChild(copy);
 
       const download = makeEl("button", "highlight-button-download");
       const downloadImg = makeEl("img");
-      downloadImg.src =
-        "chrome://browser/content/screenshots/download-white.svg";
+      downloadImg.src = browser.runtime.getURL("icons/download-white.svg");
       download.appendChild(downloadImg);
       download.append(downloadText);
       download.title = downloadTitle;