corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1497940 - Part IV, Move pluginProblem resources from chrome://mozapps to chrome://global r=mossop

Browse Source 
This is needed because UA Widget cannot load resources from chrome://mozapps.

Depends on D11701

Differential Revision: https://phabricator.services.mozilla.com/D11702
This commit is contained in:
Timothy Guan-tin Chien
2018-11-22 05:49:22 +00:00
parent b355cc6fc0
commit e8ebecf3a7
18 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser-plugins.js
View File

@@ -445,7 +445,7 @@ var gPluginHandler = {
// 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");

2
browser/themes/linux/preferences/applications.css
View File

@@ -42,7 +42,7 @@ menuitem[appHandlerIcon="save"] {
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 {

2
browser/themes/osx/preferences/applications.css
View File

@@ -53,7 +53,7 @@ menuitem[appHandlerIcon="save"] {
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 */

6
browser/themes/shared/notification-icons.inc.css
View File

@@ -253,12 +253,12 @@ html|*#webRTC-previewVideo {
/* 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 {
@@ -289,7 +289,7 @@ html|*#webRTC-previewVideo {
}
.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;
}

2
browser/themes/windows/preferences/applications.css
View File

@@ -42,7 +42,7 @@ menuitem[appHandlerIcon="save"] {
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 {

4
caps/tests/mochitest/test_bug292789.html
View File

@@ -60,8 +60,8 @@ function testScriptSrc(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"],

2
toolkit/mozapps/extensions/Blocklist.jsm
View File

@@ -1327,7 +1327,7 @@ var Blocklist = {
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,

6
toolkit/mozapps/extensions/test/browser/browser_bug523784.js
View File

@@ -11,7 +11,7 @@ var args = {
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",
@@ -96,7 +96,7 @@ function bug523784_test2(win) {
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",
@@ -104,7 +104,7 @@ function bug523784_test2(win) {
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",

2
toolkit/pluginproblem/content/pluginProblem.xml
View File

@@ -18,7 +18,7 @@
<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>

1
toolkit/themes/osx/global/jar.mn
View File

@@ -65,3 +65,4 @@ toolkit.jar:
* 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)

0
toolkit/themes/osx/mozapps/plugins/pluginHelp-16.png → toolkit/themes/osx/global/plugins/pluginHelp-16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 477 B

After

Width:  |  Height:  |  Size: 477 B

1
toolkit/themes/osx/mozapps/jar.mn
View File

@@ -14,7 +14,6 @@ toolkit.jar:
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)

2
toolkit/themes/shared/extensions/extensions.inc.css
View File

@@ -362,7 +362,7 @@ button.warning {
}
.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 {

7
toolkit/themes/shared/jar.inc.mn
View File

@@ -96,3 +96,10 @@ toolkit.jar:
#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)

9
toolkit/themes/shared/mozapps.inc.mn
View File

@@ -23,20 +23,13 @@
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

2
toolkit/themes/shared/non-mac.jar.inc.mn
View File

@@ -26,6 +26,7 @@
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)
@@ -35,7 +36,6 @@
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)

12
toolkit/themes/shared/plugins/pluginProblem.css
View File

@@ -45,7 +45,7 @@
:-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 {
@@ -67,19 +67,19 @@ html|a {
:-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 {
@@ -144,7 +144,7 @@ html|a {
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;
}

0
toolkit/themes/windows/mozapps/plugins/pluginHelp-16.png → toolkit/themes/windows/global/plugins/pluginHelp-16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 477 B

After

Width:  |  Height:  |  Size: 477 B