Bug 1195162 - Move mozapps/plugins into pluginproblem (r=sicking,bsmedberg)
authorChristoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Mon, 14 Sep 2015 19:08:06 -0700
changeset 296826 92ba84502c367b5f8f81f59168f1bc43e26b24c2
parent 296825 58e1f5749c0918b372ed5d484829f579429685d5
child 296827 2c9f4d2e77fabd283b530a0c34bd21719c0a762b
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking, bsmedberg
bugs1195162
milestone43.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 1195162 - Move mozapps/plugins into pluginproblem (r=sicking,bsmedberg)
mobile/android/locales/jar.mn
toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
toolkit/locales/jar.mn
toolkit/moz.build
toolkit/mozapps/extensions/content/pluginPrefs.xul
toolkit/mozapps/plugins/content/pluginFinderBinding.css
toolkit/mozapps/plugins/content/pluginProblem.xml
toolkit/mozapps/plugins/content/pluginProblemBinding.css
toolkit/mozapps/plugins/content/pluginProblemContent.css
toolkit/mozapps/plugins/jar.mn
toolkit/mozapps/plugins/moz.build
toolkit/mozapps/plugins/pluginGlue.manifest
toolkit/pluginproblem/content/pluginFinderBinding.css
toolkit/pluginproblem/content/pluginProblem.xml
toolkit/pluginproblem/content/pluginProblemBinding.css
toolkit/pluginproblem/content/pluginProblemContent.css
toolkit/pluginproblem/jar.mn
toolkit/pluginproblem/moz.build
toolkit/pluginproblem/pluginGlue.manifest
--- a/mobile/android/locales/jar.mn
+++ b/mobile/android/locales/jar.mn
@@ -53,17 +53,17 @@ relativesrcdir toolkit/locales:
   locale/@AB_CD@/browser/overrides/charsetMenu.properties          (%chrome/global/charsetMenu.properties)
   locale/@AB_CD@/browser/overrides/commonDialogs.properties        (%chrome/global/commonDialogs.properties)
   locale/@AB_CD@/browser/overrides/intl.properties                 (%chrome/global/intl.properties)
   locale/@AB_CD@/browser/overrides/intl.css                        (%chrome/global/intl.css)
   locale/@AB_CD@/browser/overrides/passwordmgr.properties          (%chrome/passwordmgr/passwordmgr.properties)
   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)
 #about:crashes
   locale/@AB_CD@/browser/overrides/crashreporter/crashes.dtd         (%crashreporter/crashes.dtd)
   locale/@AB_CD@/browser/overrides/crashreporter/crashes.properties  (%crashreporter/crashes.properties)
 #about:mozilla
   locale/@AB_CD@/browser/overrides/global/mozilla.dtd                (%chrome/global/mozilla.dtd)
@@ -80,17 +80,17 @@ relativesrcdir toolkit/locales:
 % override chrome://global/locale/charsetMenu.properties chrome://browser/locale/overrides/charsetMenu.properties
 % override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.properties
 % override chrome://mozapps/locale/handling/handling.properties chrome://browser/locale/handling.properties
 % override chrome://global/locale/intl.properties chrome://browser/locale/overrides/intl.properties
 % override chrome://global/locale/intl.css chrome://browser/locale/overrides/intl.css
 % 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
 % override chrome://global/locale/crashes.properties chrome://browser/locale/overrides/crashreporter/crashes.properties
 % override chrome://global/locale/mozilla.dtd chrome://browser/locale/overrides/global/mozilla.dtd
 % override chrome://global/locale/aboutTelemetry.dtd chrome://browser/locale/overrides/global/aboutTelemetry.dtd
 % override chrome://global/locale/aboutTelemetry.properties chrome://browser/locale/overrides/global/aboutTelemetry.properties
 % override chrome://global/locale/aboutWebrtc.properties chrome://browser/locale/overrides/global/aboutWebrtc.properties
rename from toolkit/locales/en-US/chrome/mozapps/plugins/plugins.dtd
rename to toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -103,28 +103,29 @@
   locale/@AB_CD@/mozapps/extensions/selectAddons.dtd              (%chrome/mozapps/extensions/selectAddons.dtd)
   locale/@AB_CD@/mozapps/extensions/selectAddons.properties       (%chrome/mozapps/extensions/selectAddons.properties)
   locale/@AB_CD@/mozapps/extensions/update.dtd                    (%chrome/mozapps/extensions/update.dtd)
   locale/@AB_CD@/mozapps/extensions/update.properties             (%chrome/mozapps/extensions/update.properties)
   locale/@AB_CD@/mozapps/extensions/newaddon.dtd                  (%chrome/mozapps/extensions/newaddon.dtd)
   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)
   locale/@AB_CD@/mozapps/profile/createProfileWizard.dtd          (%chrome/mozapps/profile/createProfileWizard.dtd)
   locale/@AB_CD@/mozapps/profile/profileSelection.properties      (%chrome/mozapps/profile/profileSelection.properties)
   locale/@AB_CD@/mozapps/profile/profileSelection.dtd             (%chrome/mozapps/profile/profileSelection.dtd)
   locale/@AB_CD@/mozapps/update/updates.dtd                       (%chrome/mozapps/update/updates.dtd)
   locale/@AB_CD@/mozapps/update/updates.properties                (%chrome/mozapps/update/updates.properties)
   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)
 % locale cookie @AB_CD@ %locale/@AB_CD@/cookie/
   locale/@AB_CD@/cookie/cookieAcceptDialog.dtd           (%chrome/cookie/cookieAcceptDialog.dtd)
   locale/@AB_CD@/cookie/cookieAcceptDialog.properties    (%chrome/cookie/cookieAcceptDialog.properties)
 % locale formautofill @AB_CD@ %locale/@AB_CD@/formautofill/
   locale/@AB_CD@/formautofill/requestAutocomplete.dtd (%chrome/formautofill/requestAutocomplete.dtd)
--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -11,18 +11,18 @@ DIRS += [
     'forgetaboutsite',
     'identity',
     'locales',
     'modules',
     'mozapps/downloads',
     'mozapps/extensions',
     'mozapps/handling',
     'mozapps/preferences',
-    'mozapps/plugins',
     'obsolete',
+    'pluginproblem',
     'profile',
     'themes',
     'webapps',
 ]
 
 if CONFIG['MOZ_UPDATER'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += ['mozapps/update']
 
@@ -63,13 +63,13 @@ elif CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     if CONFIG['OS_ARCH'] == 'Darwin':
         DIRS += ['crashreporter/google-breakpad/src/common/mac']
     elif CONFIG['OS_ARCH'] == 'Linux':
         DIRS += ['crashreporter/google-breakpad/src/common/linux']
 
 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/*'):
     BUG_COMPONENT = ('Toolkit', 'Preferences')
--- a/toolkit/mozapps/extensions/content/pluginPrefs.xul
+++ b/toolkit/mozapps/extensions/content/pluginPrefs.xul
@@ -1,15 +1,15 @@
 <?xml version="1.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/.  -->
 
-<!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;">
     <label class="text-list" id="pluginLibraries"/>
   </setting>
   <setting type="control" title="&plugin.mimeTypes;">
     <label class="text-list" id="pluginMimeTypes"/>
   </setting>
rename from toolkit/mozapps/plugins/content/pluginFinderBinding.css
rename to toolkit/pluginproblem/content/pluginFinderBinding.css
--- a/toolkit/mozapps/plugins/content/pluginFinderBinding.css
+++ b/toolkit/pluginproblem/content/pluginFinderBinding.css
@@ -9,10 +9,10 @@
 embed:-moz-type-unsupported,
 applet:-moz-type-unsupported,
 object:-moz-type-unsupported,
 embed:-moz-type-unsupported-platform,
 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;
 }
rename from toolkit/mozapps/plugins/content/pluginProblem.xml
rename to toolkit/pluginproblem/content/pluginProblem.xml
--- a/toolkit/mozapps/plugins/content/pluginProblem.xml
+++ b/toolkit/pluginproblem/content/pluginProblem.xml
@@ -1,28 +1,28 @@
 <?xml version="1.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/. -->
 <!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;
 ]>
 
 <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://mozapps/content/plugins/pluginProblemContent.css"/>
+        <stylesheet src="chrome://pluginproblem/content/pluginProblemContent.css"/>
         <stylesheet src="chrome://mozapps/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"/>
rename from toolkit/mozapps/plugins/content/pluginProblemBinding.css
rename to toolkit/pluginproblem/content/pluginProblemBinding.css
--- a/toolkit/mozapps/plugins/content/pluginProblemBinding.css
+++ b/toolkit/pluginproblem/content/pluginProblemBinding.css
@@ -20,10 +20,10 @@ object:-moz-handler-disabled,
 object:-moz-handler-blocked,
 object:-moz-handler-crashed,
 object:-moz-handler-clicktoplay,
 object:-moz-handler-vulnerable-updatable,
 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;
 }
rename from toolkit/mozapps/plugins/content/pluginProblemContent.css
rename to toolkit/pluginproblem/content/pluginProblemContent.css
rename from toolkit/mozapps/plugins/jar.mn
rename to toolkit/pluginproblem/jar.mn
--- a/toolkit/mozapps/plugins/jar.mn
+++ b/toolkit/pluginproblem/jar.mn
@@ -1,10 +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 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)
+% 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)
rename from toolkit/mozapps/plugins/moz.build
rename to toolkit/pluginproblem/moz.build
rename from toolkit/mozapps/plugins/pluginGlue.manifest
rename to toolkit/pluginproblem/pluginGlue.manifest
--- a/toolkit/mozapps/plugins/pluginGlue.manifest
+++ b/toolkit/pluginproblem/pluginGlue.manifest
@@ -1,2 +1,2 @@
-category agent-style-sheets pluginGlue-pluginFinder chrome://mozapps/content/plugins/pluginFinderBinding.css
-category agent-style-sheets pluginGlue-pluginProblem chrome://mozapps/content/plugins/pluginProblemBinding.css
+category agent-style-sheets pluginGlue-pluginFinder chrome://pluginproblem/content/pluginFinderBinding.css
+category agent-style-sheets pluginGlue-pluginProblem chrome://pluginproblem/content/pluginProblemBinding.css