Bug 1494170: Show proper icon of runtime. r=jdescottes,r=Gijs

Summary: Depends on D7036

Reviewers: jdescottes,Gijs

Subscribers: MarcoM

Bug #: 1494170

Differential Revision: https://phabricator.services.mozilla.com/D7037

--HG--
extra : rebase_source : dc346ce6319bddbc65ac3caec6caa7096fd1a5cc

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

@@ -168,6 +168,15 @@ var whitelist = [
    platforms: ["macosx"]},
   // Bug 1483277 (temporarily unreferenced)
   {file: "chrome://browser/content/browser.xhtml"},
+  // Bug 1494170 (the url below is dynamically generated by JS when we use)
+  {file: "chrome://devtools/skin/images/aboutdebugging-firefox-aurora.svg",
+   isFromDevTools: true},
+  // Bug 1494170 (the url below is dynamically generated by JS when we use)
+  {file: "chrome://devtools/skin/images/aboutdebugging-firefox-beta.svg",
+   isFromDevTools: true},
+  // Bug 1494170 (the url below is dynamically generated by JS when we use)
+  {file: "chrome://devtools/skin/images/aboutdebugging-firefox-release.svg",
+   isFromDevTools: true},
 ];
 
 whitelist = new Set(whitelist.filter(item =>

devtools/client/aboutdebugging-new/src/actions/runtimes.js

@@ -68,10 +68,14 @@ async function createClientForRuntime(runtime) {
 
 async function getRuntimeInfo(client) {
   const deviceFront = await client.mainRoot.getFront("device");
-  const { brandName: name, version } = await deviceFront.getDescription();
+  const { brandName: name, channel, version } = await deviceFront.getDescription();
+  const icon =
+    (channel === "release" || channel === "beta" || channel === "aurora")
+      ? `chrome://devtools/skin/images/aboutdebugging-firefox-${ channel }.svg`
+      : "chrome://devtools/skin/images/aboutdebugging-firefox-nightly.svg";
 
   return {
-    icon: "chrome://branding/content/icon64.png",
+    icon,
     name,
     version,
   };

devtools/client/jar.mn

@@ -114,7 +114,11 @@ devtools.jar:
     skin/images/filter-swatch.svg (themes/images/filter-swatch.svg)
     skin/images/aboutdebugging-collapse-icon.svg (themes/images/aboutdebugging-collapse-icon.svg)
     skin/images/aboutdebugging-connect-icon.svg (themes/images/aboutdebugging-connect-icon.svg)
+    skin/images/aboutdebugging-firefox-aurora.svg (themes/images/aboutdebugging-firefox-aurora.svg)
+    skin/images/aboutdebugging-firefox-beta.svg (themes/images/aboutdebugging-firefox-beta.svg)
     skin/images/aboutdebugging-firefox-logo.svg (themes/images/aboutdebugging-firefox-logo.svg)
+    skin/images/aboutdebugging-firefox-nightly.svg (themes/images/aboutdebugging-firefox-nightly.svg)
+    skin/images/aboutdebugging-firefox-release.svg (themes/images/aboutdebugging-firefox-release.svg)
     skin/images/aboutdebugging-globe-icon.svg (themes/images/aboutdebugging-globe-icon.svg)
     skin/images/fox-smiling.svg (themes/images/fox-smiling.svg)
     skin/images/grid.svg (themes/images/grid.svg)