Bug 328678 - XULRunner should include about:plugins, r=neil@p

browser/extensions/Makefile.in

@@ -46,6 +46,4 @@ ifneq (,$(findstring layout-debug,$(MOZ_EXTENSIONS)))
 DIRS  += layout-debug
 endif
 
-DIRS  += package-fixup
-
 include $(topsrcdir)/config/rules.mk

browser/extensions/package-fixup/Makefile.in

@@ -1,49 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Browser code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Brian Ryner <bryner@brianryner.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-# This directory exists to selectively package components from Seamonkey 
-# for use in the browser so as to avoid building large directory structures
-# such as mozilla/themes and getting a lot of unnecessary material.
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk

browser/extensions/package-fixup/communicator.css

@@ -1,2 +0,0 @@
-@import url("chrome://global/skin/");
-

browser/extensions/package-fixup/jar.mn

@@ -1,5 +0,0 @@
-classic.jar:
-        skin/classic/global/plugins.css                                       (../../../themes/classic/global/plugins.css)
-
-toolkit.jar:
-        content/global/plugins.html                                           (../../../xpfe/global/resources/content/plugins.html)

themes/classic/jar.mn

@@ -310,7 +310,7 @@ classic.jar:
   skin/classic/global/progressmeter/progressmeter-busy.gif    (global/win/progressmeter/progressmeter-busy.gif)
 #endif
   skin/classic/global/netError.css                                      (global/netError.css)
-  skin/classic/global/plugins.css                                       (global/plugins.css)
+  skin/classic/global/plugins.css                                       (/toolkit/empty-file)
   skin/classic/global/printing.css                                      (global/printing.css)
 # chrome://global/skin/nativescrollbars.css is used on Mac
   skin/classic/global/nativescrollbars.css                              (global/mac/nativescrollbars.css)

toolkit/content/jar.mn

@@ -6,6 +6,8 @@ toolkit.jar:
    content/global/XPCNativeWrapper.js         (XPCNativeWrapper.js)
 *  content/global/xul.css                     (xul.css)
 *  content/global/about.xhtml                 (about.xhtml)
+   content/global/plugins.html
+   content/global/plugins.css
 *  content/global/debug.js                    (debug.js)
 +  content/global/buildconfig.html            (buildconfig.html)
 +  content/global/charsetOverlay.js           (charsetOverlay.js)

toolkit/content/plugins.css

@@ -119,4 +119,4 @@ th.desc {
 
 th.enabled {
   width: 10%;
-}
+}

toolkit/content/plugins.html

@@ -50,6 +50,7 @@
 
   document.writeln("<title>" + pluginsbundle.GetStringFromName("title_label") + "<\/title>");
 </script>
+<link rel="stylesheet" type="text/css" href="chrome://global/content/plugins.css">
 <link rel="stylesheet" type="text/css" href="chrome://global/skin/plugins.css">
 </head>
 <body>

toolkit/themes/pinstripe/global/jar.mn

@@ -37,6 +37,7 @@ classic.jar:
 +  skin/classic/global/menulist.css
 +  skin/classic/global/notification.css
 +  skin/classic/global/netError.css
+   skin/classic/global/plugins.css         (/toolkit/empty-file)
 +  skin/classic/global/popup.css
 +  skin/classic/global/progressmeter.css
 +  skin/classic/global/radio.css

toolkit/themes/winstripe/global/jar.mn

@@ -24,6 +24,7 @@ classic.jar:
         skin/classic/global/notification.css
         skin/classic/global/netError.css
         skin/classic/global/popup.css
+        skin/classic/global/plugins.css (/toolkit/empty-file)
         skin/classic/global/preferences.css
         skin/classic/global/printPageSetup.css
         skin/classic/global/printPreview.css

xpfe/global/jar.mn

@@ -81,7 +81,8 @@ toolkit.jar:
 #endif
         content/global/aboutAbout.html              (resources/content/aboutAbout.html) 
         content/global/about.xul                    (resources/content/about.xul) 
-        content/global/plugins.html                 (resources/content/plugins.html)
+        content/global/plugins.html                 (/toolkit/content/plugins.html)
+        content/global/plugins.css                  (/toolkit/content/plugins.css)
         content/global/fullScreen.js                (resources/content/fullScreen.js)
         content/global/build.dtd                    (build.dtd)