diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js index 74dec957025d..1a5531069d31 100644 --- a/browser/base/content/test/static/browser_all_files_referenced.js +++ b/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 => diff --git a/devtools/client/aboutdebugging-new/src/actions/runtimes.js b/devtools/client/aboutdebugging-new/src/actions/runtimes.js index d112e64b67c6..159c98d38147 100644 --- a/devtools/client/aboutdebugging-new/src/actions/runtimes.js +++ b/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, }; diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index 037b662fc76b..e2cac6780a47 100644 --- a/devtools/client/jar.mn +++ b/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) diff --git a/devtools/client/themes/images/aboutdebugging-firefox-aurora.svg b/devtools/client/themes/images/aboutdebugging-firefox-aurora.svg new file mode 100644 index 000000000000..cf9346068954 --- /dev/null +++ b/devtools/client/themes/images/aboutdebugging-firefox-aurora.svg @@ -0,0 +1 @@ +firefox-logo-developer-edition \ No newline at end of file diff --git a/devtools/client/themes/images/aboutdebugging-firefox-beta.svg b/devtools/client/themes/images/aboutdebugging-firefox-beta.svg new file mode 100644 index 000000000000..87505f4611fc --- /dev/null +++ b/devtools/client/themes/images/aboutdebugging-firefox-beta.svg @@ -0,0 +1 @@ +firefox-logo-beta \ No newline at end of file diff --git a/devtools/client/themes/images/aboutdebugging-firefox-nightly.svg b/devtools/client/themes/images/aboutdebugging-firefox-nightly.svg new file mode 100644 index 000000000000..f1af370d87c5 --- /dev/null +++ b/devtools/client/themes/images/aboutdebugging-firefox-nightly.svg @@ -0,0 +1 @@ +firefox-logo-nightly \ No newline at end of file diff --git a/devtools/client/themes/images/aboutdebugging-firefox-release.svg b/devtools/client/themes/images/aboutdebugging-firefox-release.svg new file mode 100644 index 000000000000..4b330869baf9 --- /dev/null +++ b/devtools/client/themes/images/aboutdebugging-firefox-release.svg @@ -0,0 +1 @@ +firefox-logo \ No newline at end of file