Bug 1421039 - Remove duplicate extension icons r=mstriemer

Differential Revision: https://phabricator.services.mozilla.com/D63288
iaxat · Mar 23, 2020 · c6efce4 · c6efce4
1 parent ee68f6c
commit c6efce4
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 43 deletions.
diff --git a/browser/components/extensions/test/browser/browser_ext_identity_indication.js b/browser/components/extensions/test/browser/browser_ext_identity_indication.js
@@ -29,7 +29,7 @@ function confirmExtensionPage() {
 
   is(
     getComputedStyle(identityIconEl).listStyleImage,
-    'url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg")',
+    'url("chrome://mozapps/skin/extensions/extension.svg")',
     "Identity icon should be the default extension icon"
   );
 

diff --git a/browser/components/preferences/in-content/extensionControlled.js b/browser/components/preferences/in-content/extensionControlled.js
@@ -247,7 +247,7 @@ function showEnableExtensionMessage(settingName) {
   };
   let label = document.createXULElement("label");
   let addonIcon = icon(
-    "chrome://mozapps/skin/extensions/extensionGeneric-16.svg",
+    "chrome://mozapps/skin/extensions/extension.svg",
     "addons-icon"
   );
   let toolbarIcon = icon("chrome://browser/skin/menu.svg", "menu-icon");

diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
@@ -16,10 +16,8 @@ browser/chrome/browser/content/branding/icon32.png
 browser/chrome/browser/content/branding/icon48.png
 browser/chrome/browser/content/branding/icon64.png
 browser/chrome/browser/content/browser/defaultthemes/5.header.png
-browser/chrome/browser/content/browser/extension.svg
 browser/chrome/browser/content/browser/places/bookmarkProperties.xhtml
 browser/chrome/browser/content/browser/places/bookmarkProperties2.xhtml
-browser/chrome/browser/skin/classic/browser/addons/addon-install-confirm.svg
 browser/chrome/browser/skin/classic/browser/connection-secure.svg
 browser/chrome/browser/skin/classic/browser/controlcenter/warning-gray.svg
 # devtools reduction is bug 1311178

diff --git a/browser/themes/shared/addon-notification.inc.css b/browser/themes/shared/addon-notification.inc.css
@@ -55,7 +55,7 @@ html|*.addon-webext-perm-list {
 }
 
 .addon-addon-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
 }
 
 .addon-toolbar-icon {

diff --git a/browser/themes/shared/addons/addon-install-confirm.svg b/browser/themes/shared/addons/addon-install-confirm.svg
diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css
@@ -395,7 +395,7 @@
 }
 
 #identity-popup[connection=extension] .identity-popup-security-connection {
-  background-image: url(chrome://browser/skin/controlcenter/extension.svg);
+  background-image: url(chrome://mozapps/skin/extensions/extension.svg);
   -moz-context-properties: fill;
   fill: #60bf4c;
 }

diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css
@@ -146,11 +146,11 @@
 }
 
 #urlbar[actiontype="extension"] > #urlbar-input-container > #identity-box > #identity-icon {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
+  list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
 }
 
 #identity-box[pageproxystate="valid"].extensionPage > #identity-icon {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
+  list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
 }
 
 #identity-box[pageproxystate="valid"].verifiedDomain > #identity-icon,

diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
@@ -17,7 +17,6 @@
   skin/classic/browser/aboutWelcomeBack.css                    (../shared/aboutWelcomeBack.css)
   skin/classic/browser/setDesktopBackground.css                (../shared/setDesktopBackground.css)
   skin/classic/browser/addons/addon-install-blocked.svg        (../shared/addons/addon-install-blocked.svg)
-  skin/classic/browser/addons/addon-install-confirm.svg        (../shared/addons/addon-install-confirm.svg)
   skin/classic/browser/addons/addon-install-downloading.svg    (../shared/addons/addon-install-downloading.svg)
   skin/classic/browser/addons/addon-install-error.svg          (../shared/addons/addon-install-error.svg)
   skin/classic/browser/addons/addon-install-installed.svg      (../shared/addons/addon-install-installed.svg)
@@ -28,7 +27,6 @@
   skin/classic/browser/controlcenter/dashboard.svg             (../shared/controlcenter/dashboard.svg)
   skin/classic/browser/controlcenter/cryptominers-disabled.svg (../shared/controlcenter/cryptominers-disabled.svg)
   skin/classic/browser/controlcenter/mcb-disabled.svg          (../shared/controlcenter/mcb-disabled.svg)
-  skin/classic/browser/controlcenter/extension.svg             (../shared/controlcenter/extension.svg)
   skin/classic/browser/controlcenter/etp-milestone.svg         (../shared/controlcenter/etp-milestone.svg)
   skin/classic/browser/controlcenter/fingerprinters.svg        (../shared/controlcenter/fingerprinters.svg)
   skin/classic/browser/controlcenter/fingerprinters-disabled.svg (../shared/controlcenter/fingerprinters-disabled.svg)

diff --git a/browser/themes/shared/menupanel.inc.css b/browser/themes/shared/menupanel.inc.css
@@ -26,7 +26,7 @@
 }
 
 #appMenu-addons-button {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
+  list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
 }
 
 #PanelUI-fxa-menu-sync-prefs-button,

diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css
@@ -273,7 +273,7 @@ html|*#webRTC-previewVideo {
 /* INSTALL ADDONS */
 
 .install-icon {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.svg);
+  list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
 }
 
 .install-icon.blocked-permission-icon,
@@ -292,7 +292,7 @@ html|*#webRTC-previewVideo {
 }
 
 .popup-notification-icon[popupid="addon-install-confirmation"] {
-  list-style-image: url(chrome://browser/skin/addons/addon-install-confirm.svg);
+  list-style-image: url(chrome://browser/content/extension.svg);
 }
 
 #addon-install-confirmation-notification[warning] .popup-notification-icon[popupid="addon-install-confirmation"] {

diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -205,7 +205,7 @@ toolbar[brighttext] {
 }
 
 #add-ons-button {
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.svg");
+  list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
 }
 
 #open-file-button {

diff --git a/toolkit/components/aboutperformance/content/aboutPerformance.js b/toolkit/components/aboutperformance/content/aboutPerformance.js
@@ -373,7 +373,7 @@ var State = {
           continue;
         }
         name = `${addon.name} (${addon.id})`;
-        image = "chrome://mozapps/skin/extensions/extensionGeneric-16.svg";
+        image = "chrome://mozapps/skin/extensions/extension.svg";
         type = gSystemAddonIds.has(addon.id) ? "system-addon" : "addon";
       } else if (id == 0 && !tab.isWorker) {
         name = { id: "ghost-windows" };

diff --git a/toolkit/mozapps/extensions/content/extensions.xhtml b/toolkit/mozapps/extensions/content/extensions.xhtml
@@ -22,7 +22,7 @@
         role="application" windowtype="Addons:Manager">
 
   <xhtml:link rel="shortcut icon"
-              href="chrome://mozapps/skin/extensions/extensionGeneric-16.svg"/>
+              href="chrome://mozapps/skin/extensions/extension.svg"/>
   <linkset>
     <xhtml:link rel="localization" href="branding/brand.ftl"/>
     <xhtml:link rel="localization" href="toolkit/about/aboutAddons.ftl"/>

diff --git a/...themes/shared/controlcenter/extension.svg → ...it/themes/shared/extensions/extension.svg b/...themes/shared/controlcenter/extension.svg → ...it/themes/shared/extensions/extension.svg
diff --git a/toolkit/themes/shared/extensions/extensionGeneric-16.svg b/toolkit/themes/shared/extensions/extensionGeneric-16.svg
diff --git a/toolkit/themes/shared/mozapps.inc.mn b/toolkit/themes/shared/mozapps.inc.mn
@@ -15,8 +15,7 @@
   skin/classic/mozapps/extensions/category-service.svg       (../../shared/extensions/category-service.svg)
   skin/classic/mozapps/extensions/category-recent.svg        (../../shared/extensions/category-recent.svg)
   skin/classic/mozapps/extensions/category-available.svg     (../../shared/extensions/category-available.svg)
-
-  skin/classic/mozapps/extensions/extensionGeneric-16.svg    (../../shared/extensions/extensionGeneric-16.svg)
+  skin/classic/mozapps/extensions/extension.svg              (../../shared/extensions/extension.svg)
   skin/classic/mozapps/extensions/utilities.svg              (../../shared/extensions/utilities.svg)
   skin/classic/mozapps/extensions/alerticon-warning.svg      (../../shared/extensions/alerticon-warning.svg)
   skin/classic/mozapps/extensions/alerticon-error.svg        (../../shared/extensions/alerticon-error.svg)