Bug 1497940 - Part IV, Move pluginProblem resources from chrome://mozapps to chrome://global r=mossop
authorTimothy Guan-tin Chien <timdream@gmail.com>
Thu, 22 Nov 2018 05:49:22 +0000
changeset 504096 2eeaf4aca069daae8d5876fd808b0f2543268fdf
parent 504095 20d7a96fca5d797c8e9e108e26d569177c37d73d
child 504097 5f543ba66e2c74cfb9ece932447a2fded0da9abb
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop
bugs1497940
milestone65.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 1497940 - Part IV, Move pluginProblem resources from chrome://mozapps to chrome://global r=mossop This is needed because UA Widget cannot load resources from chrome://mozapps. Depends on D11701 Differential Revision: https://phabricator.services.mozilla.com/D11702
browser/base/content/browser-plugins.js
browser/themes/linux/preferences/applications.css
browser/themes/osx/preferences/applications.css
browser/themes/shared/notification-icons.inc.css
browser/themes/windows/preferences/applications.css
caps/tests/mochitest/test_bug292789.html
toolkit/mozapps/extensions/Blocklist.jsm
toolkit/mozapps/extensions/test/browser/browser_bug523784.js
toolkit/pluginproblem/content/pluginProblem.xml
toolkit/themes/osx/global/jar.mn
toolkit/themes/osx/global/plugins/pluginHelp-16.png
toolkit/themes/osx/mozapps/jar.mn
toolkit/themes/osx/mozapps/plugins/pluginHelp-16.png
toolkit/themes/shared/extensions/extensions.inc.css
toolkit/themes/shared/jar.inc.mn
toolkit/themes/shared/mozapps.inc.mn
toolkit/themes/shared/non-mac.jar.inc.mn
toolkit/themes/shared/plugins/pluginProblem.css
toolkit/themes/windows/global/plugins/pluginHelp-16.png
toolkit/themes/windows/mozapps/plugins/pluginHelp-16.png
--- a/browser/base/content/browser-plugins.js
+++ b/browser/base/content/browser-plugins.js
@@ -440,17 +440,17 @@ var gPluginHandler = {
     let notificationBox = gBrowser.getNotificationBox(browser);
     let notification = notificationBox.getNotificationWithValue("plugin-crashed");
     if (notification) {
       return;
     }
 
     // Configure the notification bar
     let priority = notificationBox.PRIORITY_WARNING_MEDIUM;
-    let iconURL = "chrome://mozapps/skin/plugins/pluginGeneric.svg";
+    let iconURL = "chrome://global/skin/plugins/pluginGeneric.svg";
     let reloadLabel = gNavigatorBundle.getString("crashedpluginsMessage.reloadButton.label");
     let reloadKey   = gNavigatorBundle.getString("crashedpluginsMessage.reloadButton.accesskey");
 
     let buttons = [{
       label: reloadLabel,
       accessKey: reloadKey,
       popup: null,
       callback() { browser.reload(); },
--- a/browser/themes/linux/preferences/applications.css
+++ b/browser/themes/linux/preferences/applications.css
@@ -37,17 +37,17 @@ menuitem[appHandlerIcon="ask"] {
 
 richlistitem[appHandlerIcon="save"],
 menuitem[appHandlerIcon="save"] {
   list-style-image: url("moz-icon://stock/gtk-save?size=menu");
 }
 
 richlistitem[appHandlerIcon="plugin"],
 menuitem[appHandlerIcon="plugin"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
+  list-style-image: url("chrome://global/skin/plugins/pluginGeneric.svg");
 }
 
 .actionsMenu .menulist-icon {
   margin-inline-end: 1px;
   height: 16px;
   width: 16px;
 }
 
--- a/browser/themes/osx/preferences/applications.css
+++ b/browser/themes/osx/preferences/applications.css
@@ -48,17 +48,17 @@ menuitem[appHandlerIcon="ask"] {
 
 richlistitem[appHandlerIcon="save"],
 menuitem[appHandlerIcon="save"] {
   list-style-image: url("chrome://browser/skin/preferences/saveFile.png");
 }
 
 richlistitem[appHandlerIcon="plugin"],
 menuitem[appHandlerIcon="plugin"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
+  list-style-image: url("chrome://global/skin/plugins/pluginGeneric.svg");
 }
 
 /* Repeat what menu.css does for .menuitem-iconic */
 menuitem[appHandlerIcon] {
   padding-top: 1px;
   padding-bottom: 3px;
 }
 
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -248,22 +248,22 @@ html|*#webRTC-previewVideo {
 .popup-notification-icon[popupid*="offline-app-requested"],
 .popup-notification-icon[popupid="offline-app-usage"] {
   list-style-image: url(chrome://global/skin/icons/question-64.png);
 }
 
 /* PLUGINS */
 
 .plugin-icon {
-  list-style-image: url(chrome://mozapps/skin/plugins/plugin.svg);
+  list-style-image: url(chrome://global/skin/plugins/plugin.svg);
   transition: fill 1.5s;
 }
 
 .plugin-icon.blocked-permission-icon {
-  list-style-image: url(chrome://mozapps/skin/plugins/plugin-blocked.svg);
+  list-style-image: url(chrome://global/skin/plugins/plugin-blocked.svg);
 }
 
 #plugin-icon-badge {
   list-style-image: url(chrome://browser/skin/notification-icons/plugin-badge.svg);
   opacity: 0;
   transition: opacity 1.5s;
 }
 
@@ -284,17 +284,17 @@ html|*#webRTC-previewVideo {
     opacity: 0;
   }
   to {
     opacity: 1;
   }
 }
 
 .plugin-blocked > .plugin-icon {
-  list-style-image: url(chrome://mozapps/skin/plugins/plugin-blocked.svg);
+  list-style-image: url(chrome://global/skin/plugins/plugin-blocked.svg);
   fill: #d92215 !important;
 }
 
 .plugin-blocked > #plugin-icon-badge {
   visibility: collapse;
 }
 
 #notification-popup-box[hidden] {
--- a/browser/themes/windows/preferences/applications.css
+++ b/browser/themes/windows/preferences/applications.css
@@ -37,17 +37,17 @@ menuitem[appHandlerIcon="ask"] {
 
 richlistitem[appHandlerIcon="save"],
 menuitem[appHandlerIcon="save"] {
   list-style-image: url("chrome://browser/skin/preferences/saveFile.png");
 }
 
 richlistitem[appHandlerIcon="plugin"],
 menuitem[appHandlerIcon="plugin"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
+  list-style-image: url("chrome://global/skin/plugins/pluginGeneric.svg");
 }
 
 .actionsMenu .menulist-icon {
   margin-inline-end: 3px;
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
   padding-inline-start: 0px;
--- a/caps/tests/mochitest/test_bug292789.html
+++ b/caps/tests/mochitest/test_bug292789.html
@@ -55,18 +55,18 @@ function testScriptSrc(aCallback) {
       // trigger the callback
       if (aCallback)
         aCallback();
     }
 }
 
 /** <img src=""> tests **/
 var img_global = "chrome://global/skin/media/error.png";
-var img_mozapps = "chrome://mozapps/skin/plugins/contentPluginCrashed.png";
-var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png";
+var img_mozapps = "chrome://mozapps/skin/extensions/extensionGeneric.svg";
+var res_mozapps = "resource://gre/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.svg";
 
 var imgTests = [[img_global, "success"],
                 [img_mozapps, "fail"],
                 [res_mozapps, "success"]];
 
 var curImgTest = 0;
 
 function runImgTest() {
--- a/toolkit/mozapps/extensions/Blocklist.jsm
+++ b/toolkit/mozapps/extensions/Blocklist.jsm
@@ -1322,17 +1322,17 @@ var Blocklist = {
           plugin.enabledState = Ci.nsIPluginTag.STATE_DISABLED;
       } else if (!plugin.disabled && state != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) {
         if (state != Ci.nsIBlocklistService.STATE_OUTDATED &&
             state != Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE &&
             state != Ci.nsIBlocklistService.STATE_VULNERABLE_NO_UPDATE) {
           addonList.push({
             name: plugin.name,
             version: plugin.version,
-            icon: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
+            icon: "chrome://global/skin/plugins/pluginGeneric.svg",
             disable: false,
             blocked: state == Ci.nsIBlocklistService.STATE_BLOCKED,
             item: plugin,
             url: await this.getPluginBlockURL(plugin),
           });
         }
       }
     }
--- a/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_bug523784.js
@@ -6,17 +6,17 @@ const URI_BLOCKLIST_DIALOG = "chrome://m
 // This tests that the blocklist dialog still affects soft-blocked add-ons
 // if the user clicks the "Restart Later" button. It also ensures that the
 // "Cancel" button is correctly renamed (to "Restart Later").
 var args = {
   restart: false,
   list: [{
     name: "Bug 523784 softblocked addon",
     version: "1",
-    icon: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
+    icon: "chrome://global/skin/plugins/pluginGeneric.svg",
     disable: false,
     blocked: false,
     url: "http://example.com/bug523784_1",
   }],
 };
 
 function test() {
   waitForExplicitFinish();
@@ -91,25 +91,25 @@ function bug523784_test2(win) {
   };
   Services.ww.registerNotification(windowObserver);
 
   // Add 2 more addons to the blocked list to check that the more info link
   // points to the general blocked list page.
   args.list.push({
     name: "Bug 523784 softblocked addon 2",
     version: "2",
-    icon: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
+    icon: "chrome://global/skin/plugins/pluginGeneric.svg",
     disable: false,
     blocked: false,
     url: "http://example.com/bug523784_2",
   });
   args.list.push({
     name: "Bug 523784 softblocked addon 3",
     version: "4",
-    icon: "chrome://mozapps/skin/plugins/pluginGeneric.svg",
+    icon: "chrome://global/skin/plugins/pluginGeneric.svg",
     disable: false,
     blocked: false,
     url: "http://example.com/bug523784_3",
   });
 
   args.wrappedJSObject = args;
   Services.ww.openWindow(null, URI_BLOCKLIST_DIALOG, "",
                          "chrome,centerscreen,dialog,titlebar", args);
--- a/toolkit/pluginproblem/content/pluginProblem.xml
+++ b/toolkit/pluginproblem/content/pluginProblem.xml
@@ -13,17 +13,17 @@
 
 <bindings id="pluginBindings"
               xmlns="http://www.mozilla.org/xbl"
               xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
               xmlns:html="http://www.w3.org/1999/xhtml">
 <binding id="pluginProblem" inheritstyle="false" chromeOnlyContent="true" bindToUntrustedContent="true">
     <resources>
         <stylesheet src="chrome://pluginproblem/content/pluginProblemContent.css"/>
-        <stylesheet src="chrome://mozapps/skin/plugins/pluginProblem.css"/>
+        <stylesheet src="chrome://global/skin/plugins/pluginProblem.css"/>
     </resources>
 
     <content>
         <html:div class="mainBox" anonid="main" chromedir="&locale.dir;">
             <html:div class="hoverBox">
                 <html:label>
                     <html:button class="icon" anonid="icon"/>
                     <html:div class="msg msgVulnerabilityStatus" anonid="vulnerabilityStatus"><!-- set at runtime --></html:div>
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -60,8 +60,9 @@ toolkit.jar:
   skin/classic/global/icons/error-16.png                             (icons/error-16.png)
   skin/classic/global/icons/error-64.png                             (icons/error-64.png)
   skin/classic/global/icons/question-16.png                          (icons/question-16.png)
   skin/classic/global/icons/question-64.png                          (icons/question-64.png)
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
 * skin/classic/global/in-content/common.css                          (in-content/common.css)
 * skin/classic/global/in-content/info-pages.css                      (in-content/info-pages.css)
   skin/classic/global/tree/columnpicker.gif                          (tree/columnpicker.gif)
+  skin/classic/global/plugins/pluginHelp-16.png                      (plugins/pluginHelp-16.png)
rename from toolkit/themes/osx/mozapps/plugins/pluginHelp-16.png
rename to toolkit/themes/osx/global/plugins/pluginHelp-16.png
--- a/toolkit/themes/osx/mozapps/jar.mn
+++ b/toolkit/themes/osx/mozapps/jar.mn
@@ -9,13 +9,12 @@ toolkit.jar:
   skin/classic/mozapps/extensions/discover-logo.png               (extensions/discover-logo.png)
   skin/classic/mozapps/extensions/rating-won.png                  (extensions/rating-won.png)
   skin/classic/mozapps/extensions/rating-not-won.png              (extensions/rating-not-won.png)
   skin/classic/mozapps/extensions/cancel.png                      (extensions/cancel.png)
   skin/classic/mozapps/extensions/toolbarbutton-dropmarker.png    (extensions/toolbarbutton-dropmarker.png)
   skin/classic/mozapps/extensions/heart.png                       (extensions/heart.png)
 * skin/classic/mozapps/extensions/extensions.css                  (extensions/extensions.css)
   skin/classic/mozapps/extensions/blocklist.css                   (extensions/blocklist.css)
-  skin/classic/mozapps/plugins/pluginHelp-16.png                  (plugins/pluginHelp-16.png)
   skin/classic/mozapps/profile/profileSelection.css               (profile/profileSelection.css)
   skin/classic/mozapps/update/buttons.png                         (update/buttons.png)
 * skin/classic/mozapps/update/updates.css                         (update/updates.css)
   skin/classic/mozapps/handling/handling.css                      (handling/handling.css)
--- a/toolkit/themes/shared/extensions/extensions.inc.css
+++ b/toolkit/themes/shared/extensions/extensions.inc.css
@@ -357,17 +357,17 @@ button.warning {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.svg");
 }
 
 .addon-view[type="locale"] .icon {
   list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.svg");
 }
 
 .addon-view[type="plugin"] .icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.svg");
+  list-style-image: url("chrome://global/skin/plugins/pluginGeneric.svg");
 }
 
 .addon-view[type="dictionary"] .icon {
   list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.svg");
 }
 
 .addon-view[type="experiment"] .icon {
   list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.svg");
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -91,8 +91,15 @@ toolkit.jar:
   skin/classic/global/media/pauseButton.svg                (../../shared/media/pauseButton.svg)
   skin/classic/global/media/playButton.svg                 (../../shared/media/playButton.svg)
   skin/classic/global/media/error.png                      (../../shared/media/error.png)
   skin/classic/global/media/throbber.png                   (../../shared/media/throbber.png)
   skin/classic/global/media/stalled.png                    (../../shared/media/stalled.png)
 #ifdef MOZ_PLACES
   skin/classic/mozapps/places/defaultFavicon.svg           (../../shared/places/defaultFavicon.svg)
 #endif
+  skin/classic/global/plugins/plugin.svg                    (../../shared/plugins/plugin.svg)
+  skin/classic/global/plugins/plugin-blocked.svg            (../../shared/plugins/plugin-blocked.svg)
+  skin/classic/global/plugins/pluginGeneric.svg             (../../shared/extensions/category-plugins.svg)
+  skin/classic/global/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
+  skin/classic/global/plugins/contentPluginBlocked.png      (../../shared/plugins/contentPluginBlocked.png)
+  skin/classic/global/plugins/contentPluginCrashed.png      (../../shared/plugins/contentPluginCrashed.png)
+  skin/classic/global/plugins/contentPluginStripe.png       (../../shared/plugins/contentPluginStripe.png)
--- a/toolkit/themes/shared/mozapps.inc.mn
+++ b/toolkit/themes/shared/mozapps.inc.mn
@@ -18,28 +18,21 @@
 
   skin/classic/mozapps/extensions/extensionGeneric-16.svg    (../../shared/extensions/extensionGeneric-16.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)
   skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/extensions/alerticon-info-positive.svg)
   skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/extensions/alerticon-info-negative.svg)
   skin/classic/mozapps/extensions/category-legacy.svg        (../../shared/extensions/category-legacy.svg)
-  skin/classic/mozapps/plugins/plugin.svg                    (../../shared/plugins/plugin.svg)
-  skin/classic/mozapps/plugins/plugin-blocked.svg            (../../shared/plugins/plugin-blocked.svg)
-  skin/classic/mozapps/plugins/pluginGeneric.svg             (../../shared/extensions/category-plugins.svg)
-  skin/classic/mozapps/plugins/pluginProblem.css             (../../shared/plugins/pluginProblem.css)
   skin/classic/mozapps/aboutNetworking.css                   (../../shared/aboutNetworking.css)
 #ifndef ANDROID
   skin/classic/mozapps/aboutProfiles.css                     (../../shared/aboutProfiles.css)
 #endif
   skin/classic/mozapps/aboutServiceWorkers.css               (../../shared/aboutServiceWorkers.css)
-  skin/classic/mozapps/plugins/contentPluginBlocked.png      (../../shared/plugins/contentPluginBlocked.png)
-  skin/classic/mozapps/plugins/contentPluginCrashed.png      (../../shared/plugins/contentPluginCrashed.png)
-  skin/classic/mozapps/plugins/contentPluginStripe.png       (../../shared/plugins/contentPluginStripe.png)
 
-% override chrome://mozapps/skin/extensions/category-plugins.svg          chrome://mozapps/skin/plugins/pluginGeneric.svg
+% override chrome://mozapps/skin/extensions/category-plugins.svg          chrome://global/skin/plugins/pluginGeneric.svg
 % override chrome://mozapps/skin/extensions/category-extensions.svg       chrome://mozapps/skin/extensions/extensionGeneric.svg
 % override chrome://mozapps/skin/extensions/category-languages.svg        chrome://mozapps/skin/extensions/localeGeneric.svg
 % override chrome://mozapps/skin/extensions/category-themes.svg           chrome://mozapps/skin/extensions/themeGeneric.svg
 % override chrome://mozapps/skin/extensions/category-dictionaries.svg chrome://mozapps/skin/extensions/dictionaryGeneric.svg
 % override chrome://mozapps/skin/extensions/localeGeneric.svg         chrome://mozapps/skin/extensions/dictionaryGeneric.svg
 % override chrome://mozapps/skin/extensions/category-experiments.svg  chrome://mozapps/skin/extensions/experimentGeneric.svg
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -21,22 +21,22 @@
   skin/classic/global/arrow/panelarrow-vertical.svg        (../../windows/global/arrow/panelarrow-vertical.svg)
 
 * skin/classic/global/dirListing/dirListing.css            (../../windows/global/dirListing/dirListing.css)
   skin/classic/global/icons/error-16.png                   (../../windows/global/icons/error-16.png)
   skin/classic/global/icons/question-16.png                (../../windows/global/icons/question-16.png)
   skin/classic/global/icons/question-64.png                (../../windows/global/icons/question-64.png)
   skin/classic/global/icons/search-textbox.svg             (../../windows/global/icons/search-textbox.svg)
   skin/classic/global/tree/columnpicker.gif                (../../windows/global/tree/columnpicker.gif)
+  skin/classic/global/plugins/pluginHelp-16.png            (../../windows/global/plugins/pluginHelp-16.png)
 
   skin/classic/mozapps/downloads/downloadButtons.png         (../../windows/mozapps/downloads/downloadButtons.png)
   skin/classic/mozapps/downloads/unknownContentType.css      (../../windows/mozapps/downloads/unknownContentType.css)
   skin/classic/mozapps/extensions/blocklist.css              (../../windows/mozapps/extensions/blocklist.css)
   skin/classic/mozapps/extensions/discover-logo.png          (../../windows/mozapps/extensions/discover-logo.png)
   skin/classic/mozapps/extensions/rating-won.png             (../../windows/mozapps/extensions/rating-won.png)
   skin/classic/mozapps/extensions/rating-not-won.png         (../../windows/mozapps/extensions/rating-not-won.png)
   skin/classic/mozapps/extensions/cancel.png                 (../../windows/mozapps/extensions/cancel.png)
   skin/classic/mozapps/handling/handling.css                 (../../windows/mozapps/handling/handling.css)
-  skin/classic/mozapps/plugins/pluginHelp-16.png             (../../windows/mozapps/plugins/pluginHelp-16.png)
   skin/classic/mozapps/profile/profileSelection.css          (../../windows/mozapps/profile/profileSelection.css)
   skin/classic/mozapps/update/downloadButtons.png            (../../windows/mozapps/update/downloadButtons.png)
 
 % override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png       chrome://mozapps/skin/extensions/extensionGeneric.svg
--- a/toolkit/themes/shared/plugins/pluginProblem.css
+++ b/toolkit/themes/shared/plugins/pluginProblem.css
@@ -40,17 +40,17 @@
 :-moz-handler-vulnerable-no-update .hoverBox:active .msgClickToPlay {
   color: red;
 }
 
 :-moz-handler-vulnerable-updatable .hoverBox,
 :-moz-handler-vulnerable-no-update .hoverBox,
 :-moz-handler-blocked .hoverBox,
 :-moz-handler-crashed .hoverBox {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginStripe.png);
+  background-image: url(chrome://global/skin/plugins/contentPluginStripe.png);
 }
 
 html|a {
   color: white;
 }
 
 .icon {
   width: 48px;
@@ -62,29 +62,29 @@ html|a {
   background-color: transparent;
   -moz-user-focus: ignore;
   margin-bottom: 6px;
   -moz-context-properties: fill;
 }
 
 :-moz-handler-vulnerable-updatable .icon,
 :-moz-handler-vulnerable-no-update .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginBlocked.png);
+  background-image: url(chrome://global/skin/plugins/contentPluginBlocked.png);
   -moz-user-focus: normal;
 }
 :-moz-handler-blocked .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginBlocked.png);
+  background-image: url(chrome://global/skin/plugins/contentPluginBlocked.png);
 }
 :-moz-handler-clicktoplay .icon {
-  background-image: url(chrome://mozapps/skin/plugins/plugin.svg);
+  background-image: url(chrome://global/skin/plugins/plugin.svg);
   fill: var(--grey-10);
   -moz-user-focus: normal;
 }
 :-moz-handler-crashed .icon {
-  background-image: url(chrome://mozapps/skin/plugins/contentPluginCrashed.png);
+  background-image: url(chrome://global/skin/plugins/contentPluginCrashed.png);
 }
 
 .throbber {
   padding-left: 16px; /* width of the background image */
   background: url(chrome://global/skin/icons/loading.png) no-repeat;
   margin-left: 5px;
 }
 
@@ -139,17 +139,17 @@ html|a {
 .mainBox[chromedir="rtl"] .submitButton {
   float: left;
 }
 
 .helpIcon {
   display: inline-block;
   min-width: 16px;
   min-height: 16px;
-  background: url(chrome://mozapps/skin/plugins/pluginHelp-16.png) no-repeat;
+  background: url(chrome://global/skin/plugins/pluginHelp-16.png) no-repeat;
   cursor: pointer;
   float: left;
 }
 
 .mainBox[chromedir="rtl"] .helpIcon {
   float: right;
 }
 
copy from toolkit/themes/osx/mozapps/plugins/pluginHelp-16.png
copy to toolkit/themes/windows/global/plugins/pluginHelp-16.png
deleted file mode 100644
index e46cb06afda977605118473bb72c1e9a24243693..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001