Bug 386392 - Drop pre places/places-bookmarks support from browser/. r=gavin.

This commit is contained in:
2007-07-17 14:08:24 -07:00
parent e1617d73e8
commit 96eca9b86c
49 changed files with 23 additions and 2227 deletions

View File

@@ -52,11 +52,7 @@ class nsILocalFile;
class nsINIParser;
class nsIPermissionManager;
class nsIPrefBranch;
#ifdef MOZ_PLACES_BOOKMARKS
class nsINavBookmarksService;
#else
class nsIBookmarksService;
#endif
class nsIRDFResource;
class nsOperaProfileMigrator : public nsIBrowserProfileMigrator
@@ -108,7 +104,6 @@ protected:
nsresult CopyHistory(PRBool aReplace);
nsresult CopyBookmarks(PRBool aReplace);
#ifdef MOZ_PLACES_BOOKMARKS
void ClearToolbarFolder(nsINavBookmarksService * aBookmarksService, PRInt64 aToolbarFolder);
nsresult ParseBookmarksFolder(nsILineInputStream* aStream,
PRInt64 aFolder,
@@ -119,18 +114,6 @@ protected:
nsIStringBundle* aBundle,
PRInt64 aParentFolder);
#endif // defined(XP_WIN) || (defined(XP_UNIX) && !defined(XP_MACOSX))
#else
void ClearToolbarFolder(nsIBookmarksService* aBookmarksService, nsIRDFResource* aToolbarFolder);
nsresult ParseBookmarksFolder(nsILineInputStream* aStream,
nsIRDFResource* aFolder,
nsIRDFResource* aToolbar,
nsIBookmarksService* aBMS);
#if defined(XP_WIN) || (defined(XP_UNIX) && !defined(XP_MACOSX))
nsresult CopySmartKeywords(nsIBookmarksService* aBMS,
nsIStringBundle* aBundle,
nsIRDFResource* aParentFolder);
#endif // defined(XP_WIN) || (defined(XP_UNIX) && !defined(XP_MACOSX))
#endif // MOZ_PLACES_BOOKMARKS
void GetOperaProfile(const PRUnichar* aProfile, nsILocalFile** aFile);