corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 321219 - separate places backend into toolkit, r=beng

Browse Source
This commit is contained in:
benjamin@smedbergs.us
2006-07-18 19:41:12 +00:00
parent 2d7a976512
commit bd9d3ba313
20 changed files with 219 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
browser/components/build/nsModule.cpp
View File

@@ -39,15 +39,7 @@
#include "nsIGenericFactory.h"
#include "nsBrowserCompsCID.h"
#ifdef MOZ_PLACES
#include "nsAnnoProtocolHandler.h"
#include "nsAnnotationService.h"
#include "nsNavHistory.h"
#include "nsNavBookmarks.h"
#include "nsFaviconService.h"
#include "nsLivemarkService.h"
#include "nsMorkHistoryImporter.h"
#else
#ifndef MOZ_PLACES
#include "nsBookmarksService.h"
#include "nsForwardProxyDataSource.h"
#endif
@@ -88,16 +80,7 @@
/////////////////////////////////////////////////////////////////////////////
#ifdef MOZ_PLACES
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNavHistory, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsNavHistoryResultTreeViewer)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAnnoProtocolHandler)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAnnotationService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNavBookmarks, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFaviconService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsLivemarkService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsMorkHistoryImporter)
#else
#ifndef MOZ_PLACES
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsForwardProxyDataSource, Init)
#endif
@@ -152,58 +135,7 @@ static const nsModuleComponentInfo components[] =
#endif
#if defined(MOZ_PLACES)
{ "Browser Navigation History",
NS_NAVHISTORYSERVICE_CID,
NS_NAVHISTORYSERVICE_CONTRACTID,
nsNavHistoryConstructor },
{ "Browser Navigation History",
NS_NAVHISTORYSERVICE_CID,
"@mozilla.org/browser/global-history;2",
nsNavHistoryConstructor },
{ "Browser Navigation History",
NS_NAVHISTORYSERVICE_CID,
"@mozilla.org/autocomplete/search;1?name=history",
nsNavHistoryConstructor },
{ "History tree view",
NS_NAVHISTORYRESULTTREEVIEWER_CID,
NS_NAVHISTORYRESULTTREEVIEWER_CONTRACTID,
nsNavHistoryResultTreeViewerConstructor },
{ "Page Annotation Service",
NS_ANNOTATIONSERVICE_CID,
NS_ANNOTATIONSERVICE_CONTRACTID,
nsAnnotationServiceConstructor },
{ "Annotation Protocol Handler",
NS_ANNOPROTOCOLHANDLER_CID,
NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "moz-anno",
nsAnnoProtocolHandlerConstructor },
{ "Browser Bookmarks Service",
NS_NAVBOOKMARKSSERVICE_CID,
NS_NAVBOOKMARKSSERVICE_CONTRACTID,
nsNavBookmarksConstructor },
{ "Favicon Service",
NS_FAVICONSERVICE_CID,
NS_FAVICONSERVICE_CONTRACTID,
nsFaviconServiceConstructor },
{ "Livemark Service",
NS_LIVEMARKSERVICE_CID,
NS_LIVEMARKSERVICE_CONTRACTID,
nsLivemarkServiceConstructor },
{ "Mork History Importer",
NS_MORKHISTORYIMPORTER_CID,
NS_MORKHISTORYIMPORTER_CONTRACTID,
nsMorkHistoryImporterConstructor },
#else
#ifndef MOZ_PLACES
{ "Bookmarks",
NS_BOOKMARKS_SERVICE_CID,