Bug 382813 - nsFaviconService shouldn't rely on icons in chrome://browser. r=sspitzer.

browser/themes/pinstripe/browser/browser.css

@@ -959,7 +959,11 @@ toolbar[iconsize="small"] #paste-button:hover:active {
 }
 
 #page-proxy-button {
+%ifdef MOZ_PLACES
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+%else
   list-style-image: url("chrome://browser/skin/bookmarks/bookmark-item.png");
+%endif
 }
 
 #page-proxy-button[pageproxystate="invalid"] {
@@ -1189,7 +1193,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 .bookmark-item {
-	  list-style-image: url("chrome://browser/skin/bookmarks/bookmark-item.png");
+%ifdef MOZ_PLACES
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+%else
+  list-style-image: url("chrome://browser/skin/bookmarks/bookmark-item.png");
+%endif
 }
 
 .openintabs-menuitem {

browser/themes/pinstripe/browser/jar.mn

@@ -27,7 +27,6 @@ classic.jar:
   skin/classic/browser/Secure-background.gif
   skin/classic/browser/Toolbar-small.png
   skin/classic/browser/Toolbar.png
-  skin/classic/browser/bookmarks/bookmark-item.png          (bookmarks/bookmark-item.png)
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
@@ -35,9 +34,10 @@ classic.jar:
   skin/classic/browser/monitor.png
 #ifdef MOZ_PLACES
   skin/classic/browser/places/places.css                    (places/places.css)
-  skin/classic/browser/places/defaultFavicon.png            (places/defaultFavicon.png)
   skin/classic/browser/places/query.png                     (places/query.png)
   skin/classic/browser/places/livemarkItem.png              (places/livemarkItem.png)
+#else
+  skin/classic/browser/bookmarks/bookmark-item.png          (bookmarks/bookmark-item.png)
 #endif
 #ifdef MOZ_PLACES_BOOKMARKS
   skin/classic/browser/places/bookmarksMenu.png             (places/bookmarksMenu.png)
@@ -82,4 +82,3 @@ classic.jar:
   skin/classic/browser/preferences/preferences.css          (preferences/preferences.css)
   icon.png
   preview.png
-

browser/themes/winstripe/browser/jar.mn

@@ -47,7 +47,6 @@ classic.jar:
         skin/classic/browser/feeds/subscribe.css                (feeds/subscribe.css)
 #ifdef MOZ_PLACES
         skin/classic/browser/places/places.css                  (places/places.css)
-        skin/classic/browser/places/defaultFavicon.png          (places/defaultFavicon.png)
         skin/classic/browser/places/query.png                   (places/query.png)
         skin/classic/browser/places/livemarkItem.png            (places/livemarkItem.png)
 #endif

toolkit/components/places/src/nsFaviconService.h

@@ -125,9 +125,5 @@ private:
   friend class FaviconLoadListener;
 };
 
-#ifdef XP_MACOSX
-#define FAVICON_DEFAULT_URL "chrome://browser/skin/bookmarks/bookmark-item.png"
-#else
-#define FAVICON_DEFAULT_URL "chrome://browser/skin/places/defaultFavicon.png"
-#endif
+#define FAVICON_DEFAULT_URL "chrome://mozapps/skin/places/defaultFavicon.png"
 #define FAVICON_ANNOTATION_NAME "favicon"

toolkit/themes/pinstripe/mozapps/jar.mn

@@ -34,4 +34,7 @@ classic.jar:
   skin/classic/mozapps/update/update.png                          (update/update.png)
   skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png         (xpinstall/xpinstallItemGeneric.png)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (xpinstall/xpinstallConfirm.css)
+#ifdef MOZ_PLACES
+  skin/classic/mozapps/places/defaultFavicon.png                  (places/defaultFavicon.png)
+#endif
 #endif

toolkit/themes/winstripe/mozapps/jar.mn

@@ -35,4 +35,7 @@ classic.jar:
         skin/classic/mozapps/update/updates.css                       (update/updates.css)
         skin/classic/mozapps/xpinstall/xpinstallConfirm.css           (xpinstall/xpinstallConfirm.css)
         skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png       (xpinstall/xpinstallItemGeneric.png)
+#ifdef MOZ_PLACES
+        skin/classic/mozapps/places/defaultFavicon.png                (places/defaultFavicon.png)
+#endif
 #endif