wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1195162 - Move mozapps/plugins into pluginproblem (r=sicking,bsmedberg)

Browse Source
This commit is contained in:
Christoph Kerschbaumer 2015-09-14 19:08:06 -07:00
parent 8cb5179e17
commit 01b73fef69
14 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/locales/jar.mn
View File

@ -58,7 +58,7 @@ relativesrcdir toolkit/locales:
locale/@AB_CD@/browser/overrides/search/search.properties (%chrome/search/search.properties)
locale/@AB_CD@/browser/overrides/update/updates.properties (%chrome/mozapps/update/updates.properties)
# plugins
locale/@AB_CD@/browser/overrides/plugins/plugins.dtd (%chrome/mozapps/plugins/plugins.dtd)
locale/@AB_CD@/browser/overrides/plugins/pluginproblem.dtd (%chrome/pluginproblem/pluginproblem.dtd)
# about:support
locale/@AB_CD@/browser/overrides/global/aboutSupport.dtd (%chrome/global/aboutSupport.dtd)
locale/@AB_CD@/browser/overrides/global/aboutSupport.properties (%chrome/global/aboutSupport.properties)
@ -85,7 +85,7 @@ relativesrcdir toolkit/locales:
% override chrome://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/overrides/passwordmgr/passwordmgr.properties
% override chrome://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties
% override chrome://mozapps/locale/update/updates.properties chrome://browser/locale/overrides/update/updates.properties
% override chrome://mozapps/locale/plugins/plugins.dtd chrome://browser/locale/overrides/plugins/plugins.dtd
% override chrome://pluginproblem/locale/pluginproblem.dtd chrome://browser/locale/overrides/plugins/pluginproblem.dtd
% override chrome://global/locale/aboutSupport.dtd chrome://browser/locale/overrides/global/aboutSupport.dtd
% override chrome://global/locale/aboutSupport.properties chrome://browser/locale/overrides/global/aboutSupport.properties
% override chrome://global/locale/crashes.dtd chrome://browser/locale/overrides/crashreporter/crashes.dtd

0
toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd → toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
View File

3
toolkit/locales/jar.mn
View File

@ -108,7 +108,6 @@
locale/@AB_CD@/mozapps/extensions/newaddon.properties (%chrome/mozapps/extensions/newaddon.properties)
locale/@AB_CD@/mozapps/handling/handling.dtd (%chrome/mozapps/handling/handling.dtd)
locale/@AB_CD@/mozapps/handling/handling.properties (%chrome/mozapps/handling/handling.properties)
locale/@AB_CD@/mozapps/plugins/plugins.dtd (%chrome/mozapps/plugins/plugins.dtd)
locale/@AB_CD@/mozapps/preferences/changemp.dtd (%chrome/mozapps/preferences/changemp.dtd)
locale/@AB_CD@/mozapps/preferences/removemp.dtd (%chrome/mozapps/preferences/removemp.dtd)
locale/@AB_CD@/mozapps/preferences/preferences.properties (%chrome/mozapps/preferences/preferences.properties)
@ -120,6 +119,8 @@
locale/@AB_CD@/mozapps/update/history.dtd (%chrome/mozapps/update/history.dtd)
locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/extensions/xpinstallConfirm.dtd)
locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/extensions/xpinstallConfirm.properties)
% locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
locale/@AB_CD@/pluginproblem/pluginproblem.dtd (%chrome/pluginproblem/pluginproblem.dtd)
% locale alerts @AB_CD@ %locale/@AB_CD@/alerts/
locale/@AB_CD@/alerts/alert.dtd (%chrome/alerts/alert.dtd)
locale/@AB_CD@/alerts/notificationNames.properties (%chrome/alerts/notificationNames.properties)

4
toolkit/moz.build
View File

@ -16,8 +16,8 @@ DIRS += [
'mozapps/extensions',
'mozapps/handling',
'mozapps/preferences',
'mozapps/plugins',
'obsolete',
'pluginproblem',
'profile',
'themes',
'webapps',
@ -68,7 +68,7 @@ elif CONFIG['MOZ_ENABLE_PROFILER_SPS']:
with Files('mozapps/installer/windows/*'):
BUG_COMPONENT = ('Toolkit', 'NSIS Installer')
with Files('mozapps/plugins/*'):
with Files('pluginproblem/*'):
BUG_COMPONENT = ('Core', 'Plug-ins')
with Files('mozapps/preferences/*'):

2
toolkit/mozapps/extensions/content/pluginPrefs.xul
View File

@ -4,7 +4,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE window SYSTEM "chrome://mozapps/locale/plugins/plugins.dtd">
<!DOCTYPE window SYSTEM "chrome://pluginproblem/locale/pluginproblem.dtd">
<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<setting type="control" title="&plugin.file;">

10
toolkit/mozapps/plugins/jar.mn
View File

@ -1,10 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit.jar:
% content mozapps %content/mozapps/
content/mozapps/plugins/pluginProblem.xml (content/pluginProblem.xml)
content/mozapps/plugins/pluginProblemContent.css (content/pluginProblemContent.css)
content/mozapps/plugins/pluginProblemBinding.css (content/pluginProblemBinding.css)
content/mozapps/plugins/pluginFinderBinding.css (content/pluginFinderBinding.css)

2
toolkit/mozapps/plugins/pluginGlue.manifest
View File

@ -1,2 +0,0 @@
category agent-style-sheets pluginGlue-pluginFinder chrome://mozapps/content/plugins/pluginFinderBinding.css
category agent-style-sheets pluginGlue-pluginProblem chrome://mozapps/content/plugins/pluginProblemBinding.css

2
toolkit/mozapps/plugins/content/pluginFinderBinding.css → toolkit/pluginproblem/content/pluginFinderBinding.css
View File

@ -14,5 +14,5 @@ applet:-moz-type-unsupported-platform,
object:-moz-type-unsupported-platform {
display: inline-block;
overflow: hidden;
-moz-binding: url('chrome://mozapps/content/plugins/pluginProblem.xml#pluginProblem') !important;
-moz-binding: url('chrome://pluginproblem/content/pluginProblem.xml#pluginProblem') !important;
}

6
toolkit/mozapps/plugins/content/pluginProblem.xml → toolkit/pluginproblem/content/pluginProblem.xml
View File

@ -3,10 +3,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE bindings [
<!ENTITY % pluginsDTD SYSTEM "chrome://mozapps/locale/plugins/plugins.dtd">
<!ENTITY % pluginproblemDTD SYSTEM "chrome://pluginproblem/locale/pluginproblem.dtd">
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%pluginsDTD;
%pluginproblemDTD;
%globalDTD;
%brandDTD;
]>
@ -17,7 +17,7 @@
xmlns:html="http://www.w3.org/1999/xhtml">
<binding id="pluginProblem" inheritstyle="false" chromeOnlyContent="true" bindToUntrustedContent="true">
<resources>
<stylesheet src="chrome://mozapps/content/plugins/pluginProblemContent.css"/>
<stylesheet src="chrome://pluginproblem/content/pluginProblemContent.css"/>
<stylesheet src="chrome://mozapps/skin/plugins/pluginProblem.css"/>
</resources>

2
toolkit/mozapps/plugins/content/pluginProblemBinding.css → toolkit/pluginproblem/content/pluginProblemBinding.css
View File

@ -25,5 +25,5 @@ object:-moz-handler-vulnerable-no-update {
display: inline-block;
overflow: hidden;
opacity: 1 !important;
-moz-binding: url('chrome://mozapps/content/plugins/pluginProblem.xml#pluginProblem') !important;
-moz-binding: url('chrome://pluginproblem/content/pluginProblem.xml#pluginProblem') !important;
}

0
toolkit/mozapps/plugins/content/pluginProblemContent.css → toolkit/pluginproblem/content/pluginProblemContent.css
View File

10
toolkit/pluginproblem/jar.mn Normal file
View File

@ -0,0 +1,10 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
toolkit.jar:
% content pluginproblem %pluginproblem/ contentaccessible=yes
pluginproblem/pluginProblem.xml (content/pluginProblem.xml)
pluginproblem/pluginProblemContent.css (content/pluginProblemContent.css)
pluginproblem/pluginProblemBinding.css (content/pluginProblemBinding.css)
pluginproblem/pluginFinderBinding.css (content/pluginFinderBinding.css)

0
toolkit/mozapps/plugins/moz.build → toolkit/pluginproblem/moz.build
View File

2
toolkit/pluginproblem/pluginGlue.manifest Normal file
View File

@ -0,0 +1,2 @@
category agent-style-sheets pluginGlue-pluginFinder chrome://pluginproblem/content/pluginFinderBinding.css
category agent-style-sheets pluginGlue-pluginProblem chrome://pluginproblem/content/pluginProblemBinding.css