From bc0d818748a0b11c8150f610f25bc318602ec135 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <reed@reedloden.com>
Date: Tue, 20 Nov 2007 21:28:47 -0800
Subject: [PATCH] Bug 400460 - "appPicker.css should be moved to /mozapps/skin/
 for themers" [p=jmathies@mozilla.com (Jim Mathies) r=gavin
 a=blocking-firefox3+]

---
 toolkit/components/apppicker/content/appPicker.xul              | 2 +-
 toolkit/components/apppicker/jar.mn                             | 1 -
 toolkit/themes/pinstripe/global/jar.mn                          | 1 +
 .../apppicker/content => themes/winstripe/global}/appPicker.css | 0
 toolkit/themes/winstripe/global/jar.mn                          | 1 +
 5 files changed, 3 insertions(+), 2 deletions(-)
 rename toolkit/{components/apppicker/content => themes/winstripe/global}/appPicker.css (100%)

diff --git a/toolkit/components/apppicker/content/appPicker.xul b/toolkit/components/apppicker/content/appPicker.xul
index 2a33602f054..2f1baabfcff 100644
--- a/toolkit/components/apppicker/content/appPicker.xul
+++ b/toolkit/components/apppicker/content/appPicker.xul
@@ -34,7 +34,7 @@
 # ***** END LICENSE BLOCK *****
 
   <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-  <?xml-stylesheet href="chrome://global/content/appPicker.css" type="text/css"?>
+  <?xml-stylesheet href="chrome://global/skin/appPicker.css" type="text/css"?>
 
   <!DOCTYPE dialog SYSTEM "chrome://global/locale/appPicker.dtd" >
 
diff --git a/toolkit/components/apppicker/jar.mn b/toolkit/components/apppicker/jar.mn
index b693a00cae4..d0382a72fa6 100644
--- a/toolkit/components/apppicker/jar.mn
+++ b/toolkit/components/apppicker/jar.mn
@@ -1,5 +1,4 @@
 toolkit.jar:
 * content/global/appPicker.xul                     (content/appPicker.xul)
 * content/global/appPicker.js                      (content/appPicker.js)
-* content/global/appPicker.css                     (content/appPicker.css)
 
diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn
index 6adb7a45ac0..22f7ca35e8f 100644
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -6,6 +6,7 @@ classic.jar:
 +  skin/classic/global/50pct_transparent_grey.png
 +  skin/classic/global/50pct_transparent_white.png
 +  skin/classic/global/about.css                                      (../../winstripe/global/about.css)
++  skin/classic/global/appPicker.css                                  (../../winstripe/global/appPicker.css)
 +  skin/classic/global/arrow.css
 +  skin/classic/global/autocomplete.css
 +  skin/classic/global/button.css
diff --git a/toolkit/components/apppicker/content/appPicker.css b/toolkit/themes/winstripe/global/appPicker.css
similarity index 100%
rename from toolkit/components/apppicker/content/appPicker.css
rename to toolkit/themes/winstripe/global/appPicker.css
diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn
index 64b21e30cd7..7cf72ae3c63 100644
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -1,6 +1,7 @@
 classic.jar:
 % skin global classic/1.0 %skin/classic/global/
         skin/classic/global/about.css
+        skin/classic/global/appPicker.css
         skin/classic/global/arrow.css
 *       skin/classic/global/autocomplete.css
         skin/classic/global/button.css