From 70c9201782121ae9214a31f792db9d3784fcbb2f Mon Sep 17 00:00:00 2001
From: "slamm%netscape.com" <slamm%netscape.com>
Date: Wed, 11 Aug 1999 22:02:28 +0000
Subject: [PATCH] Replace 'resource:' urls with 'chrome:' urls (bug #10341).
 a=chofmann

---
 suite/common/bookmarks/bookmarks.css          | 16 +++---
 .../bookmarks/resources/bookmarks.css         | 16 +++---
 .../bookmarks/resources/bookmarks.xul         |  4 +-
 .../bookmarks/resources/makefile.win          | 56 ++++++++++---------
 .../search/resources/findresults.css          | 16 +++---
 .../search/resources/internetresults.css      | 16 +++---
 6 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/suite/common/bookmarks/bookmarks.css b/suite/common/bookmarks/bookmarks.css
index 9337b5bc755..fc54ad74408 100644
--- a/suite/common/bookmarks/bookmarks.css
+++ b/suite/common/bookmarks/bookmarks.css
@@ -34,37 +34,37 @@ treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > t
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/bookmark-folder-closed.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-folder-closed.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/bookmark-folder-open.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-folder-open.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/personal-folder-closed.gif");
+ list-style-image: url("chrome://bookmarks/skin/personal-folder-closed.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/personal-folder-open.gif");
+ list-style-image: url("chrome://bookmarks/skin/personal-folder-open.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/bookmark-item.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/iefavorite.gif");
+ list-style-image: url("chrome://bookmarks/skin/iefavorite.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/bookmark-item.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > treecell > titledbutton
@@ -91,5 +91,5 @@ treeitem[container="true"] > treerow > treecell > titledbutton {
 }
 
 titledbutton#bookmarks {
- list-style-image:url("resource:/res/samples/bookmark-item.gif");
+ list-style-image:url("chrome://bookmarks/skin/bookmark-item.gif");
 }
diff --git a/xpfe/components/bookmarks/resources/bookmarks.css b/xpfe/components/bookmarks/resources/bookmarks.css
index 9337b5bc755..fc54ad74408 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.css
+++ b/xpfe/components/bookmarks/resources/bookmarks.css
@@ -34,37 +34,37 @@ treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > t
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/bookmark-folder-closed.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-folder-closed.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/bookmark-folder-open.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-folder-open.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/personal-folder-closed.gif");
+ list-style-image: url("chrome://bookmarks/skin/personal-folder-closed.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/personal-folder-open.gif");
+ list-style-image: url("chrome://bookmarks/skin/personal-folder-open.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/bookmark-item.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/iefavorite.gif");
+ list-style-image: url("chrome://bookmarks/skin/iefavorite.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > treecell > titledbutton
 {
- list-style-image: url("resource:/res/samples/bookmark-item.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > treecell > titledbutton
@@ -91,5 +91,5 @@ treeitem[container="true"] > treerow > treecell > titledbutton {
 }
 
 titledbutton#bookmarks {
- list-style-image:url("resource:/res/samples/bookmark-item.gif");
+ list-style-image:url("chrome://bookmarks/skin/bookmark-item.gif");
 }
diff --git a/xpfe/components/bookmarks/resources/bookmarks.xul b/xpfe/components/bookmarks/resources/bookmarks.xul
index da2ddf94680..d999da2caf5 100644
--- a/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -23,7 +23,7 @@
    type="text/css"?>
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "resource:/res/samples/bookmarks.dtd">
+<!DOCTYPE window SYSTEM "chrome://bookmarks/content/locale/bookmarks.dtd">
 <xul:window title="&bookmarksWindowTitle.label;"
   xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -37,7 +37,7 @@
     <menu value="&menu.file.label;">
 	  <menupopup>
       <menuitem value="&menuitem.newWindow.label;"
-                onaction="window.open('resource:/res/samples/bookmarks.xul',
+                onaction="window.open('chrome://bookmarks/content/',
                                      'ManageBookmarks',
                                      'chrome,menubar,resizable');" />
       <menuitem value="&menuitem.newBookmark.label;" onaction="return doContextCmd('http://home.netscape.com/NC-rdf#bookmarkcommand?newbookmark');" />
diff --git a/xpfe/components/bookmarks/resources/makefile.win b/xpfe/components/bookmarks/resources/makefile.win
index 6d3cdc4dc86..394392e9ff7 100644
--- a/xpfe/components/bookmarks/resources/makefile.win
+++ b/xpfe/components/bookmarks/resources/makefile.win
@@ -17,31 +17,35 @@
 
 DEPTH=..\..\..\..
 
-FILES=\
-        bm-panel.xul                    \
-        bm-props.xul                    \
-        bm-props.js                     \
-        bookmark-folder-closed.gif      \
-        bookmark-folder-open.gif        \
-        bookmark-item.gif               \
-        bookmark-popup.js               \
-        bookmarks.css                   \
-        bookmarks.html                  \
-        bookmarks.js                    \
-        bookmarks.xul                   \
-        iefavorite.gif                  \
-        manage-bookmarks.css            \
-        personal-folder-closed.gif      \
-        personal-folder-open.gif        \
-        locale/en-US/bm-props.dtd \
-        locale/en-US/bookmarks.dtd \
-        $(NULL)
+CHROME_DIR          = bookmarks
+CHROME_CONTENT_DIR  = content/default
+CHROME_SKIN_DIR     = skin/default
+CHROME_SOURCE_DIR	= $(srcdir)
+
+CHROME_CONTENT = \
+	.\bm-panel.xul \
+	.\bm-props.xul \
+	.\bm-props.js \
+	.\bookmark-popup.js \
+	.\bookmarks.html \
+	.\bookmarks.js \
+	.\bookmarks.xul \
+	$(NULL)
+
+CHROME_SKIN = \
+	.\bookmark-folder-closed.gif \
+	.\bookmark-folder-open.gif \
+	.\bookmark-item.gif \
+	.\bookmarks.css \
+	.\iefavorite.gif \
+	.\manage-bookmarks.css \
+	.\personal-folder-closed.gif \
+	.\personal-folder-open.gif \
+	$(NULL)
+
+CHROME_L10N = \
+	.\locale\en-US\bm-props.dtd \
+	.\locale\en-US\bookmarks.dtd \
+	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
-
-install:: $(FILES:/=\)
-	!@$(MAKE_INSTALL) $** $(DIST)\bin\res\samples
-
-clobber:: $(FILES:/=\)
-        !$(RM) $(DIST)\bin\res\samples\$**
-
diff --git a/xpfe/components/search/resources/findresults.css b/xpfe/components/search/resources/findresults.css
index 26553f6374d..af7fcb1c5f0 100755
--- a/xpfe/components/search/resources/findresults.css
+++ b/xpfe/components/search/resources/findresults.css
@@ -25,31 +25,31 @@ treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > t
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/bookmark-folder-closed.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-folder-closed.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/bookmark-folder-open.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-folder-open.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/personal-folder-closed.gif");
+ list-style-image: url("chrome://bookmarks/skin/personal-folder-closed.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/personal-folder-open.gif");
+ list-style-image: url("chrome://bookmarks/skin/personal-folder-open.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/bookmark-item.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/IEFavorite.gif");
+ list-style-image: url("chrome://bookmarks/skin/ieFavorite.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/bookmark-item.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > treecell > titledbutton {
@@ -77,5 +77,5 @@ treeitem > treerow > treecell > titledbutton {
 }
 
 titledbutton#bookmarks {
-	list-style-image:url("resource:/res/samples/bookmark-item.gif");
+	list-style-image:url("chrome://bookmarks/skin/bookmark-item.gif");
 }
diff --git a/xpfe/components/search/resources/internetresults.css b/xpfe/components/search/resources/internetresults.css
index 857576a5ebe..76c1ec7c3ed 100755
--- a/xpfe/components/search/resources/internetresults.css
+++ b/xpfe/components/search/resources/internetresults.css
@@ -25,31 +25,31 @@ treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > t
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/bookmark-folder-closed.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-folder-closed.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/bookmark-folder-open.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-folder-open.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/personal-folder-closed.gif");
+ list-style-image: url("chrome://bookmarks/skin/personal-folder-closed.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/personal-folder-open.gif");
+ list-style-image: url("chrome://bookmarks/skin/personal-folder-open.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/bookmark-item.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/IEFavorite.gif");
+ list-style-image: url("chrome://bookmarks/skin/iefavorite.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > treecell > titledbutton {
- list-style-image: url("resource:/res/samples/bookmark-item.gif");
+ list-style-image: url("chrome://bookmarks/skin/bookmark-item.gif");
 }
 
 treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > treecell > titledbutton {
@@ -77,5 +77,5 @@ treeitem > treerow > treecell > titledbutton {
 }
 
 titledbutton#bookmarks {
-	list-style-image:url("resource:/res/samples/bookmark-item.gif");
+	list-style-image:url("chrome://bookmarks/skin/bookmark-item.gif");
 }