diff --git a/toolkit/components/places/src/nsFaviconService.h b/toolkit/components/places/src/nsFaviconService.h index 60c3fd08ae35..d11ff70ea4a6 100644 --- a/toolkit/components/places/src/nsFaviconService.h +++ b/toolkit/components/places/src/nsFaviconService.h @@ -37,6 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" +#include "nsDataHashtable.h" #include "nsIFaviconService.h" #include "nsServiceManagerUtils.h" #include "nsString.h" @@ -44,6 +45,9 @@ #include "mozIStorageValueArray.h" #include "mozIStorageStatement.h" +// forward definition for friend class +class FaviconLoadListener; + class nsFaviconService : public nsIFaviconService { public: @@ -108,8 +112,16 @@ private: */ nsCOMPtr mDefaultIcon; + PRUint32 mFailedFaviconSerial; + nsDataHashtable mFailedFavicons; + nsresult SetFaviconUrlForPageInternal(nsIURI* aURI, nsIURI* aFavicon, PRBool* aHasData, PRTime* aExpiration); + + nsresult UpdateBookmarkRedirectFavicon(nsIURI* aPage, nsIURI* aFavicon); + void SendFaviconNotifications(nsIURI* aPage, nsIURI* aFaviconURI); + + friend class FaviconLoadListener; }; #define FAVICON_DEFAULT_URL "chrome://browser/skin/places/defaultFavicon.png"