diff --git a/camino/src/bookmarks/BookmarksDataSource.mm b/camino/src/bookmarks/BookmarksDataSource.mm
index 284d24fc5af..e69de29bb2d 100644
--- a/camino/src/bookmarks/BookmarksDataSource.mm
+++ b/camino/src/bookmarks/BookmarksDataSource.mm
@@ -1,857 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *			Simon Fraser <sfraser@netscape.com>
- *			Max Horn <max@quendi.de>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#import "NSString+Utils.h"
-
-#import "BookmarksDataSource.h"
-#import "BookmarkInfoController.h"
-#import "SiteIconProvider.h"
-
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-
-#include "nsVoidArray.h"
-
-#import "BookmarksService.h"
-
-@interface BookmarksDataSource(Private)
-
-- (void)refreshChildrenOfItem:(nsIContent*)item;
-
-@end
-
-const int kBookmarksRootItemTag = -2;
-
-@implementation BookmarksDataSource
-
--(id) init
-{
-  if ( (self = [super init]) )
-  {
-    mCachedHref = nil;
-  }
-  return self;
-}
-
-- (void)dealloc
-{
-//  NSLog(@"BookmarksDataSource dealloc");
-  [super dealloc];
-}
-
--(void) awakeFromNib
-{
-  // make sure these are disabled at the start since the outliner
-  // starts off with no selection.
-  [mEditBookmarkButton setEnabled:NO];
-  [mDeleteBookmarkButton setEnabled:NO];
-}
-
--(void) windowClosing
-{
-	BookmarksManager* bmManager = [BookmarksManager sharedBookmarksManagerDontAlloc];
-  [bmManager removeBookmarksClient:self];
-}
-
--(void) ensureBookmarks
-{
-  if (mRegisteredClient)
-    return;
-  
-  BookmarksManager* bmManager = [BookmarksManager sharedBookmarksManager];
-  [bmManager addBookmarksClient:self];
-  mRegisteredClient = YES;
-  
-  [mOutlineView setTarget: self];
-  [mOutlineView setDoubleAction: @selector(openBookmark:)];
-  [mOutlineView setDeleteAction: @selector(deleteBookmarks:)];
-  [mOutlineView reloadData];
-  [self restoreFolderExpandedStates];
-}
-
--(IBAction)addBookmark:(id)aSender
-{
-  [self addBookmark: aSender useSelection: YES isFolder: NO URL:nil title:nil];
-}
-
--(IBAction)addFolder:(id)aSender
-{
-  [self addBookmark: aSender useSelection: YES isFolder: YES URL:nil title:nil];
-}
-
--(void)addBookmark:(id)aSender useSelection:(BOOL)aUseSel isFolder:(BOOL)aIsFolder URL:(NSString*)aURL title:(NSString*)aTitle
-{
-  // We use the selected item to determine the parent only if aUseSel is YES.
-  BookmarkItem* item = nil;
-  if (aUseSel && ([mOutlineView numberOfSelectedRows] == 1))
-  {
-    // There is only one selected row.  If it is a folder, use it as our parent.
-    // Otherwise, use our parent,
-    int index = [mOutlineView selectedRow];
-    item = [mOutlineView itemAtRow: index];
-    if (![mOutlineView isExpandable: item]) {
-      // We can't be used as the parent.  Try our parent.
-      nsIContent* content = [item contentNode];
-      if (!content)
-        return;
-
-      nsCOMPtr<nsIContent> parentContent = content->GetParent();
-      nsCOMPtr<nsIContent> root;
-      BookmarksService::GetRootContent(getter_AddRefs(root));
-      
-      // The root has no item, so we don't need to do a lookup unless we
-      // aren't the root.
-      if (parentContent != root) {
-        PRUint32 contentID;
-        parentContent->GetContentID(&contentID);
-        item = BookmarksService::GetWrapperFor(contentID);
-      }
-    }
-  }
-
-  [self addBookmark:aSender withParent:item isFolder:aIsFolder URL:aURL title:aTitle];
-}
-
--(void)addBookmark:(id)aSender withParent:(BookmarkItem*)bmItem isFolder:(BOOL)aIsFolder URL:(NSString*)aURL title:(NSString*)aTitle
-{
-  NSString* titleString = aTitle;
-  NSString* urlString   = aURL;
-  
-  if (!aIsFolder)
-  {
-    // If no URL and title were specified, get them from the current page.
-    if (!aURL || !aTitle)
-      [[mBrowserWindowController getBrowserWrapper] getTitle:&titleString andHref:&urlString];
-
-    mCachedHref = [NSString stringWithString:urlString];
-    [mCachedHref retain];
-
-  } else {   // Folder
-    mCachedHref = nil;
-    titleString = NSLocalizedString(@"NewBookmarkFolder", @"");
-  }
-
-  NSTextField* textField  = [mBrowserWindowController getAddBookmarkTitle];
-  NSString* bookmarkTitle = titleString;
-  NSString* cleanedTitle  = [bookmarkTitle stringByReplacingCharactersInSet:[NSCharacterSet controlCharacterSet] withString:@" "];
-
-  [textField setStringValue: cleanedTitle];
-  
-  [mBrowserWindowController cacheBookmarkDS: self];
-
-  // Show/hide the bookmark all tabs checkbox as appropriate.
-  NSTabView* tabView = [mBrowserWindowController getTabBrowser];
-  id checkbox = [mBrowserWindowController getAddBookmarkCheckbox];
-  BOOL hasSuperview = [checkbox superview] != nil;
-  if (aIsFolder && hasSuperview) {
-    // Just don't show it at all.
-    [checkbox removeFromSuperview];
-    [checkbox retain];
-  }
-  else if (!aIsFolder && !hasSuperview) {
-    // Put it back in.
-    [[[mBrowserWindowController getAddBookmarkSheetWindow] contentView] addSubview: checkbox];
-    [checkbox autorelease];
-  }
-
-  // Enable the bookmark all tabs checkbox if appropriate.
-  if (!aIsFolder)
-    [[mBrowserWindowController getAddBookmarkCheckbox] setEnabled: ([tabView numberOfTabViewItems] > 1)];
-  
-  // Build up the folder list.
-  NSPopUpButton* popup = [mBrowserWindowController getAddBookmarkFolder];
-  [popup removeAllItems];
-  [popup addItemWithTitle: NSLocalizedString(@"BookmarksRootName", @"")];
-  [[popup lastItem] setTag:kBookmarksRootItemTag];
-  
-  BookmarksManager* bmManager = [BookmarksManager sharedBookmarksManager];
-  [bmManager buildFlatFolderList:[popup menu] fromRoot:NULL];
-  
-  int itemIndex = [popup indexOfItemWithTag:[bmItem intContentID]];
-  if (itemIndex != -1)
-    [popup selectItemAtIndex:itemIndex];
-  
-  [popup synchronizeTitleAndSelectedItem];
-  
-  [NSApp beginSheet: [mBrowserWindowController getAddBookmarkSheetWindow]
-     modalForWindow: [mBrowserWindowController window]
-      modalDelegate: nil //self
-     didEndSelector: nil //@selector(sheetDidEnd:)
-        contextInfo: nil];
-}
-
--(void)endAddBookmark: (int)aCode
-{
-  if (aCode == 0)
-    return;
-
-  BOOL isGroup = NO;
-  id checkbox = [mBrowserWindowController getAddBookmarkCheckbox];
-  if (([checkbox superview] != nil) && [checkbox isEnabled] && ([checkbox state] == NSOnState))
-  {
-    [mCachedHref release];
-    mCachedHref = nil;
-    isGroup = YES;
-  }
-
-  BookmarksManager* bmManager = [BookmarksManager sharedBookmarksManager];
-  NSString* titleString = [[mBrowserWindowController getAddBookmarkTitle] stringValue];
-
-  // Figure out the parent element.
-  nsCOMPtr<nsIContent> parentContent;
-  
-  NSPopUpButton* popup = [mBrowserWindowController getAddBookmarkFolder];
-  NSMenuItem* selectedItem = [popup selectedItem];
-  int tag = [selectedItem tag];
-  if (tag != kBookmarksRootItemTag)
-  {
-    BookmarkItem* item = BookmarksService::GetWrapperFor(tag);
-    // Get the content node.
-    parentContent = [item contentNode];
-  }
-  
-  if (isGroup)
-  {
-    id tabBrowser = [mBrowserWindowController getTabBrowser];
-    int count     = [tabBrowser numberOfTabViewItems];
-
-    NSMutableArray* itemsArray = [[NSMutableArray alloc] initWithCapacity:count];
-
-    for (int i = 0; i < count; i++)
-    {
-      BrowserWrapper* browserWrapper = (BrowserWrapper*)[[tabBrowser tabViewItemAtIndex: i] view];
-      
-      NSString* titleString = nil;
-      NSString* hrefString = nil;
-      [browserWrapper getTitle:&titleString andHref:&hrefString];
-
-      NSDictionary* itemDict = [NSDictionary dictionaryWithObjectsAndKeys:
-                                                titleString, @"title",
-                                                 hrefString, @"href",
-                                                             nil];
-      [itemsArray addObject:itemDict];
-    }
-    
-    [bmManager addNewBookmarkGroup:titleString items:itemsArray withParent:parentContent];
-  }
-  else
-  {
-    if (mCachedHref)
-    {
-      [bmManager addNewBookmark:mCachedHref title:titleString withParent:parentContent];
-      [mCachedHref release];
-      mCachedHref = nil;
-    }
-    else
-      [bmManager addNewBookmarkFolder:titleString withParent:parentContent];
-  }
-}
-
--(IBAction)deleteBookmarks: (id)aSender
-{
-  int index = [mOutlineView selectedRow];
-  if (index == -1)
-    return;
-
-  // first, see how many items are selected
-  BOOL haveBookmarks = NO;
-  
-  NSEnumerator* testSelRows = [mOutlineView selectedRowEnumerator];
-  for (NSNumber* currIndex = [testSelRows nextObject];
-      currIndex != nil;
-      currIndex = [testSelRows nextObject])
-  {
-    index = [currIndex intValue];
-    BookmarkItem* item = [mOutlineView itemAtRow: index];
-    if ([mOutlineView isExpandable: item]) {
-      // dumb check to see if we're deleting an empty folder. Should really
-      // recurse down
-      if ([self outlineView:mOutlineView numberOfChildrenOfItem: item] > 0)
-        haveBookmarks = YES;
-    } else
-      haveBookmarks = YES;
-  }
-
-  // ideally, we should count the number of doomed bookmarks and tell the user
-  if (haveBookmarks) {
-    NSString *alert         = NSLocalizedString(@"DeteleBookmarksAlert",@"");
-    NSString *message       = NSLocalizedString(@"DeteleBookmarksMsg",@"");
-    NSString *okButton      = NSLocalizedString(@"DeteleBookmarksOKButton",@"");
-    NSString *cancelButton  = NSLocalizedString(@"DeteleBookmarksCancelButton",@"");
-    if (NSRunAlertPanel(alert, message, okButton, cancelButton, nil) != NSAlertDefaultReturn)
-      return;
-  }
-  
-  // The alert panel was the key window.  As soon as we dismissed it, Cocoa will
-  // pick a new one for us.  Ideally, it'll be the window we were using when
-  // we clicked the delete button.  However, if by chance the BookmarkInfoController
-  // is visible, it will become the key window since it's a panel.  If we then delete
-  // the bookmark and try to close the window before we've setup a new bookmark,
-  // we'll trigger the windowDidResignKey message, which will try to update the bookmark
-  // we just deleted, and things will crash.  So, we'll trigger windowDidResignKey now
-  // and avoid the unpleasentness of a crash log.
-
-  if (![[mBrowserWindowController window] isKeyWindow])
-    [[mBrowserWindowController window] makeKeyWindow];
-  
-  // we'll run into problems if a parent item and one if its children are both selected.
-  // A cheap way of having to avoid scanning the list to remove children is to have the
-  // outliner collapse all items that are being deleted. This will cull the selection
-  // for us and eliminate any children that happened to be selected.
-  NSEnumerator* selRows = [mOutlineView selectedRowEnumerator];
-  for (NSNumber* currIndex = [selRows nextObject];
-      currIndex != nil;
-      currIndex = [selRows nextObject]) {
-    index = [currIndex intValue];
-    BookmarkItem* item = [mOutlineView itemAtRow: index];
-    [mOutlineView collapseItem: item];
-  }
-
-  // create array of items we need to delete. Deleting items out of of the
-  // selection array is problematic for some reason.
-  NSMutableArray* itemsToDelete = [[[NSMutableArray alloc] init] autorelease];
-  selRows = [mOutlineView selectedRowEnumerator];
-  for (NSNumber* currIndex = [selRows nextObject];
-      currIndex != nil;
-      currIndex = [selRows nextObject]) {
-    index = [currIndex intValue];
-    BookmarkItem* item = [mOutlineView itemAtRow: index];
-    [itemsToDelete addObject: item];
-  }
-
-  // delete all bookmarks that are in our array
-  int count = [itemsToDelete count];
-  for (int i = 0; i < count; i++) {
-    BookmarkItem* item = [itemsToDelete objectAtIndex: i];
-    [self deleteBookmark: item];
-  }
-
-  // restore selection to location near last item deleted or last item
-  int total = [mOutlineView numberOfRows];
-  if (index >= total)
-    index = total - 1;
-  [mOutlineView selectRow: index byExtendingSelection: NO];
-  // lame, but makes sure we catch all delete events in Info Panel
-  [[NSNotificationCenter defaultCenter] postNotificationName:@"NSOutlineViewSelectionDidChangeNotification" object:mOutlineView];
-}
-
--(void)deleteBookmark:(id)aItem
-{
-  [aItem remove];
-}
-
--(IBAction)openBookmark: (id)aSender
-{
-  int index = [mOutlineView selectedRow];
-  if (index == -1)
-    return;
-
-  id item = [mOutlineView itemAtRow: index];
-  if (!item)
-    return;
-
-  if ([item isGroup])
-  {
-    NSArray* groupURLs = [[BookmarksManager sharedBookmarksManager] getBookmarkGroupURIs:item];
-    [mBrowserWindowController openTabGroup:groupURLs replaceExistingTabs:YES];
-  }
-  else if ([mOutlineView isExpandable: item])
-  {
-    if ([mOutlineView isItemExpanded: item])
-      [mOutlineView collapseItem: item];
-    else
-      [mOutlineView expandItem: item];
-  }
-  else
-  {
-    // if the command key is down, follow the command-click pref
-    if (([[NSApp currentEvent] modifierFlags] & NSCommandKeyMask) &&
-        [[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.opentabfor.middleclick" withSuccess:NULL])
-    {
-      BOOL loadInBackground = [[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.loadInBackground" withSuccess:NULL];
-      [mBrowserWindowController openNewTabWithURL:[item url] referrer:nil loadInBackground: loadInBackground];
-    }
-    else
-      [[mBrowserWindowController getBrowserWrapper] loadURI:[item url] referrer:nil flags:NSLoadFlagsNone activate:YES];
-  }
-}
-
--(IBAction)openBookmarkInNewTab:(id)aSender
-{
-  int index = [mOutlineView selectedRow];
-  if (index == -1)
-    return;
-
-  if ([mOutlineView numberOfSelectedRows] == 1)
-  {
-    BookmarkItem* item = [mOutlineView itemAtRow: index];
-    BOOL loadInBackground = [[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.loadInBackground" withSuccess:NULL];
-    [mBrowserWindowController openNewTabWithURL:[item url] referrer:nil loadInBackground: loadInBackground];
-  }
-}
-
--(IBAction)openBookmarkInNewWindow:(id)aSender
-{
-  int index = [mOutlineView selectedRow];
-  if (index == -1)
-    return;
-  if ([mOutlineView numberOfSelectedRows] == 1)
-  {
-    BookmarkItem* item = [mOutlineView itemAtRow: index];
-
-    BOOL loadInBackground = [[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.loadInBackground" withSuccess:NULL];
-
-    if ([item isGroup]) 
-      [mBrowserWindowController openNewWindowWithGroup:[item contentNode] loadInBackground:loadInBackground];
-    else
-      [mBrowserWindowController openNewWindowWithURL:[item url] referrer: nil loadInBackground: loadInBackground];
-  }
-}
-
--(IBAction)showBookmarkInfo:(id)aSender
-{
-  BookmarkInfoController *bic = [BookmarkInfoController sharedBookmarkInfoController]; 
-
-  int index = [mOutlineView selectedRow];
-  BookmarkItem* item = [mOutlineView itemAtRow: index];
-  [bic setBookmark:item];
-
-  [bic showWindow:bic];
-}
-
-- (void)restoreFolderExpandedStates
-{
-  int curRow = 0;
-  
-  while (curRow < [mOutlineView numberOfRows])
-  {
-    id item = [mOutlineView itemAtRow:curRow];
-
-    if (item)
-    {
-      if ([item isExpanded])
-        [mOutlineView expandItem: item];
-      else
-        [mOutlineView collapseItem: item];
-    }
-  
-    curRow ++;
-  }
-}
-
-- (void)refreshChildrenOfItem:(nsIContent*)item
-{
-  BookmarkItem* bmItem = nil;
-
-  nsCOMPtr<nsIContent> parent;
-  if (item)
-    parent = item->GetParent();
-  if (parent)		// we're not the root
-    bmItem = [[BookmarksManager sharedBookmarksManager] getWrapperForContent:item];
-
-  [self reloadDataForItem:bmItem reloadChildren:YES];
-}
-
-#pragma mark -
-
-// BookmarksClient protocol
-
-- (void)bookmarkAdded:(nsIContent*)bookmark inContainer:(nsIContent*)container isChangedRoot:(BOOL)isRoot
-{
-  [self refreshChildrenOfItem:container];
-}
-
-- (void)bookmarkRemoved:(nsIContent*)bookmark inContainer:(nsIContent*)container isChangedRoot:(BOOL)isRoot
-{
-  [self refreshChildrenOfItem:container];
-}
-
-- (void)bookmarkChanged:(nsIContent*)bookmark
-{
-  BookmarkItem* item = [[BookmarksManager sharedBookmarksManager] getWrapperForContent:bookmark];
-  [self reloadDataForItem:item reloadChildren:NO];
-}
-
-- (void)specialFolder:(EBookmarksFolderType)folderType changedTo:(nsIContent*)newFolderContent
-{
-  // change the icons
-  
-  
-}
-
-#pragma mark -
-
-//
-// outlineView:shouldEditTableColumn:item: (delegate method)
-//
-// Called by the outliner to determine whether or not we should allow the 
-// user to edit this item. We always return NO, because we invoke the
-// edit methods manually.
-//
-- (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{
-  return NO;	//([[tableColumn identifier] isEqualToString:@"name"]);
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
-{
-  if (!mRegisteredClient) return nil;
-  
-  nsCOMPtr<nsIContent> content;
-  if (!item)
-    BookmarksService::GetRootContent(getter_AddRefs(content));
-  else
-    content = [item contentNode];
-  
-  nsCOMPtr<nsIContent> child;
-  content->ChildAt(index, getter_AddRefs(child));
-  if ( child )
-    return BookmarksService::GetWrapperFor(child);
-  
-  return nil;
-}
-
-- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
-{
-  if (!mRegisteredClient) return NO;
-  
-  if (!item)
-    return YES; // The root node is always open.
-  
-  return [item isFolder];
-}
-
-- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
-{
-  if (!mRegisteredClient) return 0;
-  
-  nsCOMPtr<nsIContent> content;
-  if (!item)
-    BookmarksService::GetRootContent(getter_AddRefs(content));
-  else 
-    content = [item contentNode];
-  
-  PRInt32 childCount = 0;
-  if ( content )
-	content->ChildCount(childCount);
-  
-  return childCount;
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
-  if (!mRegisteredClient) return nil;
-
-  id retValue = nil;
-
-  NSString *columnName = [tableColumn identifier];
-  if ([columnName isEqualToString: @"Name"]) {
-    // Return data as an NSString. We'll deal with the icon later.
-    retValue = [item name];
-  }
-  else if ([columnName isEqualToString: @"URL"]) {
-    if ([item isFolder]) {
-#if 0
-      int numKids = [item getNumberOfChildren];
-      NSString* itemCountStr = [NSString stringWithFormat:NSLocalizedString(@"Contains Items", @"%d Items"),
-                                  numKids];
-      NSMutableDictionary* colorAttributes = nil;   //XXXX fill in color attribute
-      retValue = [[NSAttributedString alloc] initWithString:itemCountStr attributes:colorAttributes];
-#endif
-    }
-    else
-      retValue = [item url];
-  }
-  return retValue;
-}
-
-- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(NSCell *)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{
-  // set the image on the name column. the url column doesn't have an image.
-  if ([[tableColumn identifier] isEqualToString: @"Name"]) {
-    NSImage* image = [[BookmarksManager sharedBookmarksManager] createIconForBookmarkItem:item useSiteIcon:YES];
-    [cell setImage:image];
-  }
-}
-
-- (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
-  // object is really an NSString, even though objectValueForTableColumn returns NSAttributedStrings.
-  BookmarkItem* bmItem = (BookmarkItem*)item;
-  NSString *columnName = [tableColumn identifier];
-  if ( [columnName isEqualTo:@"Name"] )
-  {
-    [bmItem setName:object];
-    [bmItem itemChanged:YES];
-  }
-  else if ( [columnName isEqualTo:@"URL"] ) {
-    [bmItem setUrl:object];
-    [bmItem itemChanged:YES];
-  }
-}
-
-- (BOOL)outlineView:(NSOutlineView *)ov writeItems:(NSArray*)items toPasteboard:(NSPasteboard*)pboard 
-{
-  if (!mRegisteredClient) return NO;
-  
-#ifdef FILTER_DESCENDANT_ON_DRAG
-  NSArray *toDrag = BookmarksService::FilterOutDescendantsForDrag(items);
-#else
-  NSArray *toDrag = items;
-#endif
-  int count = [toDrag count];
-  if (count > 0) {
-    // Create Pasteboard Data
-    NSMutableArray *draggedIDs = [NSMutableArray arrayWithCapacity: count];
-    
-    for (int i = 0; i < count; i++)
-      [draggedIDs addObject: [[toDrag objectAtIndex: i] contentID]];
-    
-    if (count == 1) {
-      // if we have just one item, we add some more flavours
-      [pboard declareTypes: [NSArray arrayWithObjects:
-          @"MozBookmarkType", NSURLPboardType, NSStringPboardType, nil] owner: self];
-      [pboard setPropertyList: draggedIDs forType: @"MozBookmarkType"];
-
-      NSString* itemURL = [[toDrag objectAtIndex: 0] url];
-      [pboard setString:itemURL forType: NSStringPboardType];
-      [[NSURL URLWithString:itemURL] writeToPasteboard: pboard];
-      // maybe construct the @"MozURLType" type here also
-    }
-    else {
-      // multiple bookmarks. Arrays of strings or NSURLs seem to
-      // confuse receivers. Not sure what the correct way is.
-      [pboard declareTypes: [NSArray arrayWithObject: @"MozBookmarkType"] owner: self];
-      [pboard setPropertyList: draggedIDs    forType: @"MozBookmarkType"];
-    }
-
-    return YES;
-  }
-
-  return NO;
-}
-
-
-- (NSDragOperation)outlineView:(NSOutlineView*)ov validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(int)index 
-{
-  if (!mRegisteredClient) return NSDragOperationNone;
-  
-  NSArray* types = [[info draggingPasteboard] types];
-  BOOL    isCopy = ([info draggingSourceOperationMask] == NSDragOperationCopy);
-
-  //  if the index is -1, deny the drop
-  if (index == NSOutlineViewDropOnItemIndex)
-    return NSDragOperationNone;
-
-  if ([types containsObject: @"MozBookmarkType"])
-  {
-    NSArray *draggedIDs = [[info draggingPasteboard] propertyListForType: @"MozBookmarkType"];
-
-    BookmarkItem* parent = (item) ? item : BookmarksService::GetRootItem();
-    return (BookmarksService::IsBookmarkDropValid(parent, index, draggedIDs, isCopy)) ? NSDragOperationGeneric : NSDragOperationNone;
-  }
-  
-  if ([types containsObject: @"MozURLType"])
-    return NSDragOperationGeneric;
-  
-  if ([types containsObject: NSStringPboardType])
-    return NSDragOperationGeneric;
-
-  if ([types containsObject: NSURLPboardType])
-    return NSDragOperationGeneric;
-
-  return NSDragOperationNone;
-}
-
-- (BOOL)outlineView:(NSOutlineView*)ov acceptDrop:(id <NSDraggingInfo>)info item:(id)item childIndex:(int)index
-{
-  if (!mRegisteredClient) return NO;
-
-  NSArray*      types  = [[info draggingPasteboard] types];
-  BookmarkItem* parent = (item) ? item : BookmarksService::GetRootItem();
-  BOOL          isCopy = ([info draggingSourceOperationMask] == NSDragOperationCopy);
-    
-  BookmarkItem* beforeItem = [self outlineView:ov child:index ofItem:item];
-  if ([types containsObject: @"MozBookmarkType"])
-  {
-    NSArray *draggedItems = [[info draggingPasteboard] propertyListForType: @"MozBookmarkType"];
-    return BookmarksService::PerformBookmarkDrop(parent, beforeItem, index, draggedItems, isCopy);
-  }
-  else if ([types containsObject: @"MozURLType"])
-  {
-    NSDictionary* proxy = [[info draggingPasteboard] propertyListForType: @"MozURLType"];    
-    return BookmarksService::PerformProxyDrop(parent, beforeItem, proxy);
-  }
-  else if ([types containsObject: NSStringPboardType])
-  {
-    NSString* draggedText = [[info draggingPasteboard] stringForType:NSStringPboardType];
-    return BookmarksService::PerformURLDrop(parent, beforeItem, draggedText, draggedText);
-  }
-  else if ([types containsObject: NSURLPboardType])
-  {
-    NSURL*	urlData = [NSURL URLFromPasteboard:[info draggingPasteboard]];
-    return BookmarksService::PerformURLDrop(parent, beforeItem, [urlData absoluteString], [urlData absoluteString]);
-  }
-  
-  return NO;
-}
-
-- (NSString *)outlineView:(NSOutlineView *)outlineView tooltipStringForItem:(id)item
-{
-  if (!mRegisteredClient) return @"";
-
-  NSString* descStr = nil;
-  NSString* hrefStr = nil;
-
-  if ([[item descriptionString] length] > 0)
-    descStr = [item descriptionString];
-
-  // Only description for folders
-  if ([item isFolder])
-    return descStr;
-  
-  // Extract the URL from the item
-  if ([[item url] length] > 0)
-    hrefStr = [item url];
-
-  if (!hrefStr)
-    return descStr;
-  
-  if (!descStr)
-    return hrefStr;
-
-  // Display both URL and description
-  return [NSString stringWithFormat:@"%@\n%@", hrefStr, descStr];
-}
-
-/*
-- (NSMenu *)outlineView:(NSOutlineView *)outlineView contextMenuForItem:(id)item
-{
- // TODO - return (custom?) context menu for item here.
- // Note that according to HIG, there should never be disabled items in
- // a context menu - instead, items that do not apply should be removed.
- // We could nicely do that here.
-}
-*/
-
-- (void)reloadDataForItem:(id)item reloadChildren: (BOOL)aReloadChildren
-{
-  if (!item)
-    [mOutlineView reloadData];
-  else
-    [mOutlineView reloadItem: item reloadChildren: aReloadChildren];
-}
-
-- (BOOL)haveSelectedRow
-{
-  return ([mOutlineView selectedRow] != -1);
-}
-
--(void)outlineViewSelectionDidChange: (NSNotification*) aNotification
-{
-  BookmarkInfoController *bic = [BookmarkInfoController sharedBookmarkInfoController]; 
-  int index = [mOutlineView selectedRow];
-  if (index == -1)
-  {
-    [mEditBookmarkButton setEnabled:NO];
-    [mDeleteBookmarkButton setEnabled:NO];
-    [bic close];
-  }
-  else
-  {
-    BookmarkItem* item = [mOutlineView itemAtRow: index];
-
-    [mEditBookmarkButton setEnabled:YES];
-    [mDeleteBookmarkButton setEnabled:![item isToobarRoot]];
-    if ([[bic window] isVisible]) 
-      [bic setBookmark:[mOutlineView itemAtRow:index]];
-  }
-}
-
--(BOOL)validateMenuItem:(NSMenuItem*)aMenuItem
-{
-  int  index = [mOutlineView selectedRow];
-  BOOL haveSelection = (index != -1);
-  BOOL isBookmark = NO;
-  BOOL isGroup = NO;
-  
-  BookmarkItem* item = nil;
-
-  if (haveSelection)
-  {
-    item = [mOutlineView itemAtRow: index];
-    isBookmark = ([mOutlineView isExpandable:item] == NO);
-    isGroup    = [item isGroup];
-  }
-  
-  // Bookmarks and Bookmark Groups can be opened in a new window
-  if (([aMenuItem action] == @selector(openBookmarkInNewWindow:)))
-    return (isBookmark || isGroup);
-
-  // Only Bookmarks can be opened in new tabs
-  if (([aMenuItem action] == @selector(openBookmarkInNewTab:)))
-    return isBookmark && [mBrowserWindowController newTabsAllowed];
-
-  if (([aMenuItem action] == @selector(showBookmarkInfo:)))
-    return haveSelection;
-
-  if (([aMenuItem action] == @selector(deleteBookmarks:)))
-    return haveSelection && ![item isToobarRoot];		// should deal with multiple selections
-
-  if (([aMenuItem action] == @selector(addFolder:)))
-    return YES;
-
-  return YES;
-}
-
-- (void)outlineViewItemWillExpand:(NSNotification *)notification
-{
-  BookmarkItem* item = [[notification userInfo] objectForKey:[[[notification userInfo] allKeys] objectAtIndex: 0]];
-  [item setIsExpanded:YES];
-}
-
-- (void)outlineViewItemWillCollapse:(NSNotification *)notification
-{
-  BookmarkItem* item = [[notification userInfo] objectForKey:[[[notification userInfo] allKeys] objectAtIndex: 0]];
-  [item setIsExpanded:NO];
-}
-
-@end
-
diff --git a/camino/src/bookmarks/BookmarksExport.mm b/camino/src/bookmarks/BookmarksExport.mm
index 2bea70a578c..e69de29bb2d 100644
--- a/camino/src/bookmarks/BookmarksExport.mm
+++ b/camino/src/bookmarks/BookmarksExport.mm
@@ -1,285 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *    Simon Fraser <sfraser@netscape.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <Carbon/Carbon.h>
-
-#import "BookmarksExport.h"
-#import "BookmarksService.h"
-
-#include "nsCOMPtr.h"
-#include "nsILocalFile.h"
-#include "nsILocalFileMac.h"
-#include "nsNetUtil.h"
-
-#include "nsIDOMElement.h"
-#include "nsIDOMDocument.h"
-#include "nsIContent.h"
-#include "nsIAtom.h"
-
-/*
-  Netscape HTML bookmarks format is:
-  
-  <dl><p>
-    <dt><h3>folder</h3>
-    <dl><p>
-      <dt>
-      <dt>
-      ...
-    </dl>
-    ..
-  </dl>
-  
-*/
-
-
-BookmarksExport::BookmarksExport(nsIDOMDocument* inBookmarksDoc, const char* inLinebreakStr)
-: mBookmarksDocument(inBookmarksDoc)
-, mLinebreakStr(inLinebreakStr)
-,	mWriteStatus(NS_OK)
-{
-}
-
-BookmarksExport::~BookmarksExport()
-{
-  if (mOutputStream)
-    (void)mOutputStream->Close();
-}
-
-nsresult
-BookmarksExport::ExportBookmarksToHTML(const nsAString& inFilePath)
-{
-  if (!mBookmarksDocument)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  nsresult rv = SetupOutputStream(inFilePath);
-  if (NS_FAILED(rv)) return rv;
-
-  WritePrologue();
-  nsCOMPtr<nsIDOMElement> docElement;
-  mBookmarksDocument->GetDocumentElement(getter_AddRefs(docElement));
-  WriteItem(docElement, 0, PR_TRUE);
-
-  CloseOutputStream();
-  return mWriteStatus;
-}
-
-nsresult
-BookmarksExport::SetupOutputStream(const nsAString& inFilePath)
-{
-  nsCOMPtr<nsILocalFile> destFile;
-  nsresult rv = NS_NewLocalFile(inFilePath, PR_FALSE, getter_AddRefs(destFile));
-  if (NS_FAILED(rv)) return rv;
-
-  rv = NS_NewLocalFileOutputStream(getter_AddRefs(mOutputStream), destFile);
-  if (NS_FAILED(rv)) return rv;
-
-  // we have to give the file a 'TEXT' type for IE to import it correctly
-  nsCOMPtr<nsILocalFileMac> macDestFile = do_QueryInterface(destFile);
-  if (macDestFile)
-    rv = macDestFile->SetFileType('TEXT');
-  
-  return rv;
-}
-
-void
-BookmarksExport::CloseOutputStream()
-{
-	(void)mOutputStream->Close();
-  mOutputStream = nsnull;
-}
-
-bool
-BookmarksExport::WriteChildren(nsIDOMElement* inElement, PRInt32 inDepth)
-{
-  nsCOMPtr<nsIContent> curContent = do_QueryInterface(inElement);
-  if (!curContent) return false;
-    
-  // recurse to children
-  PRInt32 numChildren;
-  curContent->ChildCount(numChildren);
-  for (PRInt32 i = 0; i < numChildren; i ++)
-  {
-    nsCOMPtr<nsIContent> curChild;
-    curContent->ChildAt(i, getter_AddRefs(curChild));
-    
-    nsCOMPtr<nsIDOMElement> curElt = do_QueryInterface(curChild);
-    if (!WriteItem(curElt, inDepth))
-      return false;
-  }
-
-  return true;
-}
-  
-bool
-BookmarksExport::WriteItem(nsIDOMElement* inElement, PRInt32 inDepth, PRBool isRoot)
-{
-  nsCOMPtr<nsIContent> curContent = do_QueryInterface(inElement);
-  if (!inElement || !curContent)
-    return false;
-  
-  nsCOMPtr<nsIAtom> tagName;
-  curContent->GetTag(getter_AddRefs(tagName));
-
-  PRBool isContainer = isRoot || (tagName == BookmarksService::gFolderAtom);
-  
-  nsAutoString href, title;
-
-  const char* const spaces = "                                                                                ";
-  const char* indentString = spaces + strlen(spaces) - (inDepth * 4);
-  if (indentString < spaces)
-    indentString = spaces;
-  
-  if (isContainer)
-  {
-    if (!isRoot)
-    {
-      WriteString(indentString, strlen(indentString));
-  
-      const char* const prefixString = "<DT><H3";
-      WriteString(prefixString, strlen(prefixString));
-  
-      nsAutoString typeAttribute;
-      inElement->GetAttribute(NS_LITERAL_STRING("type"), typeAttribute);
-      if (typeAttribute.Equals(NS_LITERAL_STRING("toolbar")))
-      {
-        const char* persToolbar = " PERSONAL_TOOLBAR_FOLDER=\"true\"";
-        WriteString(persToolbar, strlen(persToolbar));
-      }
-  
-      WriteString(">", 1);
-  
-      inElement->GetAttribute(NS_LITERAL_STRING("name"), title);
-  
-      NS_ConvertUCS2toUTF8 titleConverter(title);
-      const char* utf8String = titleConverter.get();
-  
-      // we really need to convert entities in the title, like < > etc.
-      WriteString(utf8String, strlen(utf8String));
-  
-      WriteString("</H3>", 5);
-      WriteLinebreak();
-    }
-    
-    WriteString(indentString, strlen(indentString));
-    WriteString("<DL><p>", 7);    
-    WriteLinebreak();
-  
-    if (!WriteChildren(inElement, inDepth + 1))
-      return false;
-    
-    WriteString(indentString, strlen(indentString));
-    WriteString("</DL><p>", 8);
-    WriteLinebreak();
-  }
-  else
-  {
-    if (tagName == BookmarksService::gBookmarkAtom)
-    {
-      WriteString(indentString, strlen(indentString));
-
-      const char* const bookmarkPrefix = "<DT><A HREF=\"";
-      WriteString(bookmarkPrefix, strlen(bookmarkPrefix));
-
-      inElement->GetAttribute(NS_LITERAL_STRING("href"), href);
-      inElement->GetAttribute(NS_LITERAL_STRING("name"), title);
-
-      NS_ConvertUCS2toUTF8 hrefConverter(href);
-      const char* utf8String = hrefConverter.get();
-      
-      WriteString(utf8String, strlen(utf8String));
-      WriteString("\">", 2);
-      
-      NS_ConvertUCS2toUTF8 titleConverter(title);
-      utf8String = titleConverter.get();
-
-      WriteString(utf8String, strlen(utf8String));
-      WriteString("</A>", 4);
-      WriteLinebreak();
-    }
-    else if (tagName == BookmarksService::gSeparatorAtom)
-    {
-      WriteString(indentString, strlen(indentString));
-      WriteString("<HR>", 4);
-      WriteLinebreak();
-    }
-  }
-  
-  return true;
-}
-
-void
-BookmarksExport::WritePrologue()
-{
-  const char* const gPrologueLines[] = {
-    "<!DOCTYPE NETSCAPE-Bookmark-file-1>",
-    "<!-- This is an automatically generated file.",
-    "It will be read and overwritten.",
-    "Do Not Edit! -->",
-    "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=UTF-8\">",
-    "<TITLE>Bookmarks</TITLE>",
-    "<H1>Bookmarks</H1>",
-    "",
-    nil
-  };
-
-  char* const *linePtr = gPrologueLines;
-
-  while (*linePtr)
-  {
-    WriteString(*linePtr, strlen(*linePtr));
-    WriteLinebreak();
-    linePtr++;
-  }
-}
-
-void
-BookmarksExport::WriteString(const char*inString, PRInt32 inLen)
-{
-  PRUint32 bytesWritten;
-  if (mWriteStatus == NS_OK)
-    mWriteStatus = mOutputStream->Write(inString, inLen, &bytesWritten);
-}
-
-void
-BookmarksExport::WriteLinebreak()
-{
-  WriteString(mLinebreakStr, strlen(mLinebreakStr));
-}
-  
-
diff --git a/camino/src/bookmarks/BookmarksMenu.mm b/camino/src/bookmarks/BookmarksMenu.mm
index f48f5a2c0c1..e69de29bb2d 100644
--- a/camino/src/bookmarks/BookmarksMenu.mm
+++ b/camino/src/bookmarks/BookmarksMenu.mm
@@ -1,244 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Chimera code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Simon Fraser <sfraser@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#import "NSString+Utils.h"
-
-#import "BookmarksMenu.h"
-
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-
-@interface BookmarksMenu(Private)
-
-- (NSMenu*)locateMenuForContent:(nsIContent*)content;
-- (void)addBookmark:(NSMenu*)menu parent:(nsIContent*)parent child:(nsIContent*)child index:(int)index;
-- (void)constructMenu:(NSMenu*)menu content:(nsIContent*)content;
-
-- (void)buildFoldersPopup:(NSPopUpButton*)popup curMenu:(NSMenu*)menu selectTag:(int)tagToMatch depth:(int)depth;
-
-@end
-
-#define MENU_TRUNCATION_CHARS 60
-
-@implementation BookmarksMenu
-
-- (id)initWithMenu:(NSMenu*)menu firstItem:(int)firstItem rootContent:(nsIContent*)content watchedFolder:(EBookmarksFolderType)folderType
-{
-  if ((self = [super init]))
-  {
-    mMenu = [menu retain];
-    mFirstItemIndex = firstItem;
-    mRootContent = content;
-    mWatchedFolderType = folderType;
-    NS_IF_ADDREF(mRootContent);
-    [self constructMenu:mMenu content:mRootContent];
-  }
-  
-  return self;
-}
-
-- (void)dealloc
-{
-  [mMenu release];
-  NS_IF_RELEASE(mRootContent);
-  [super dealloc];
-}
-
-- (void)constructMenu:(NSMenu*)menu content:(nsIContent*)content
-{
-  // remove existing items
-  while ([menu numberOfItems] > mFirstItemIndex)
-    [menu removeItemAtIndex:mFirstItemIndex];
-
-  if (!content) return;
-
-  // Now walk our children, and for folders also recur into them.
-  PRInt32 childCount;
-  content->ChildCount(childCount);
-  
-  for (PRInt32 i = 0; i < childCount; i++)
-  {
-    nsCOMPtr<nsIContent> child;
-    content->ChildAt(i, getter_AddRefs(child));
-    [self addBookmark:menu parent:content child:child index:-1];
-  }
-}
-
-- (void)addBookmark:(NSMenu*)menu parent:(nsIContent*)parent child:(nsIContent*)child index:(int)index
-{
-  if (!child) return;
-    
-  BookmarksManager* bmManager = [BookmarksManager sharedBookmarksManager];
-
-  BookmarkItem* bmItem 		= [bmManager getWrapperForContent:child];
-  NSImage* menuItemImage 	= [bmManager createIconForBookmarkItem:bmItem useSiteIcon:NO];
-
-  NSString* titleString   = [[bmItem name] length] > 0 ? [bmItem name] : [bmItem url];
-  NSString* bookmarkTitle = [titleString stringByTruncatingTo:MENU_TRUNCATION_CHARS at:kTruncateAtMiddle];
-
-  BOOL isFolder = [bmItem isFolder];
-  BOOL isGroup  = [bmItem isGroup];
-
-  // Create a menu or menu item for the child.
-  NSMenuItem* menuItem = [[[NSMenuItem alloc] initWithTitle:bookmarkTitle action: NULL keyEquivalent: @""] autorelease];
-  if (index == -1)
-    [menu addItem: menuItem];
-  else
-  {
-    PRInt32 insertIndex = index;
-    if (menu == mMenu)	// take static menu items into account
-      insertIndex += mFirstItemIndex;
-    
-    [menu insertItem:menuItem atIndex:insertIndex];
-  }
-
-  [menuItem setTag: [bmItem intContentID]];
-  
-  if (isFolder && !isGroup) // folder
-  {
-    NSMenu* subMenu = [[[NSMenu alloc] initWithTitle: bookmarkTitle] autorelease];
-    [menu setSubmenu: subMenu forItem: menuItem];
-    [subMenu setAutoenablesItems: NO];
-    [menuItem setImage: menuItemImage];
-    [self constructMenu:subMenu content:child];
-  }
-  else	// non-empty group or bookmark
-  {
-    [menuItem setImage: menuItemImage];
-    [menuItem setTarget: [NSApp delegate]];
-    [menuItem setAction: @selector(openMenuBookmark:)];
-  }
-}
-
-- (NSMenu*)locateMenuForContent:(nsIContent*)content
-{
-  if (content == mRootContent)
-    return mMenu;
-
-  nsCOMPtr<nsIContent> parent = content->GetParent();
-  if (!parent)
-    return nil;		// not in our subtree
-
-  NSMenu* parentMenu = [self locateMenuForContent:parent];
-  if (!parentMenu)
-    return nil;
-
-  PRUint32 contentID;
-  content->GetContentID(&contentID);
-
-  NSMenuItem* childMenu = [parentMenu itemWithTag: contentID];
-  return [childMenu submenu];
-}
-
-#pragma mark -
-
-- (void)bookmarkAdded:(nsIContent*)bookmark inContainer:(nsIContent*)container isChangedRoot:(BOOL)isRoot
-{
-  if (!container) return;
-  if (!isRoot) return;			// this code reconstructs submenus itself
-    
-  PRInt32 index = container->IndexOf(bookmark);
-  NSMenu* menu = [self locateMenuForContent:container];
-  if (menu)
-    [self addBookmark:menu parent:container child:bookmark index:index];
-}
-
-- (void)bookmarkRemoved:(nsIContent*)bookmark inContainer:(nsIContent*)container isChangedRoot:(BOOL)isRoot
-{
-  if (!bookmark) return;
-  if (!isRoot) return;			// this code reconstructs submenus itself
-
-  if (bookmark == mRootContent)
-  {
-    NS_IF_RELEASE(mRootContent);		// nulls it out
-    // we should have got a 'specialFolder' notification to reset the root already.
-#if DEBUG
-    NSLog(@"bookmarkRemoved called with root folder. Nuking menu");
-#endif    
-    [self constructMenu:mMenu content:mRootContent];
-    return;
-  }
-  
-  PRUint32 contentID = 0;
-  bookmark->GetContentID(&contentID);
-
-  NSMenu* menu = [self locateMenuForContent:container];
-  if (!menu) return;
-
-  NSMenuItem* childItem = [menu itemWithTag: contentID];
-  if (childItem)
-    [menu removeItem: childItem];
-}
-
-- (void)bookmarkChanged:(nsIContent*)bookmark
-{
-  if (!bookmark) return;
-
-  BookmarksManager* bmManager = [BookmarksManager sharedBookmarksManager];
-
-  BookmarkItem* bmItem 		= [bmManager getWrapperForContent:bookmark];
-
-  // XXX fix to not use nsIContent
-  nsCOMPtr<nsIContent> parent = bookmark->GetParent();
-
-  NSMenu* menu = [self locateMenuForContent:parent];
-  if (!menu) return;
-  
-  NSMenuItem* menuItem = [menu itemWithTag: [bmItem intContentID]];
-  NSString* titleString = [[bmItem name] length] > 0 ? [bmItem name] : [bmItem url];
-  NSString* bookmarkTitle = [titleString stringByTruncatingTo:MENU_TRUNCATION_CHARS at:kTruncateAtMiddle];
-
-  [menuItem setTitle: bookmarkTitle];
-  
-  // and reset the image
-  NSImage* menuItemImage 	= [bmManager createIconForBookmarkItem:bmItem useSiteIcon:NO];
-  [menuItem setImage:menuItemImage];
-}
-
-- (void)specialFolder:(EBookmarksFolderType)folderType changedTo:(nsIContent*)newFolderContent
-{
-  if (folderType == mWatchedFolderType)
-  {
-    NS_IF_RELEASE(mRootContent);
-    mRootContent = newFolderContent;
-    NS_IF_ADDREF(mRootContent);
-    
-    [self constructMenu:mMenu content:mRootContent];
-  }
-}
-
-@end
diff --git a/camino/src/bookmarks/BookmarksService.mm b/camino/src/bookmarks/BookmarksService.mm
index f64d0f317cd..e69de29bb2d 100644
--- a/camino/src/bookmarks/BookmarksService.mm
+++ b/camino/src/bookmarks/BookmarksService.mm
@@ -1,2402 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Simon Fraser	<sfraser@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#import "NSString+Utils.h"
-
-#import "BookmarksService.h"
-
-#import "BookmarksExport.h"
-
-#import "PreferenceManager.h"
-#import "CHBrowserView.h"
-#import "CHBrowserService.h"
-#import "SiteIconProvider.h"
-
-#include "nsString.h"
-#include "nsIDocument.h"
-#include "nsIContent.h"
-#include "nsIAtom.h"
-#include "nsITextContent.h"
-#include "nsIDOMDocumentType.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMHTMLDocument.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMCharacterData.h"
-#include "nsIDOMParser.h"
-#include "nsIFile.h"
-#include "nsAppDirectoryServiceDefs.h"
-//#include "nsIXMLHttpRequest.h"
-#include "nsIDOMSerializer.h"
-#include "nsNetUtil.h"
-#include "nsINameSpaceManager.h"
-#include "nsISyncLoadDOMService.h"
-#include "nsIChannel.h"
-
-#include "nsIEnumerator.h"
-#include "nsIContentIterator.h"
-#include "nsContentCID.h"		// for content iterator CID
-
-// Helper for stripping whitespace
-static void StripWhitespaceDOMNodes(nsIDOMNode* aNode)
-{
-  if (!aNode) return;
-  
-  nsCOMPtr<nsIDOMNode> curChild;
-  aNode->GetFirstChild(getter_AddRefs(curChild));
-
-	while (curChild)
-  {
-    nsCOMPtr<nsIDOMNode> nextChild;
-    curChild->GetNextSibling(getter_AddRefs(nextChild));
-    
-    nsCOMPtr<nsITextContent> textContent = do_QueryInterface(curChild);
-    if (textContent)
-    {
-      PRBool isWhitespace = PR_FALSE;
-      textContent->IsOnlyWhitespace(&isWhitespace);
-      if (isWhitespace)
-      {
-        nsCOMPtr<nsIDOMNode> dummy;
-        aNode->RemoveChild(curChild, getter_AddRefs(dummy));
-      }
-    }
-    else
-    {
-      StripWhitespaceDOMNodes(curChild);
-    }
-    
-    curChild = nextChild;
-	}
-}
-
-static bool ElementIsOrContains(nsIDOMElement* inSearchRoot, nsIDOMElement* inFindElt)
-{
-  nsCOMPtr<nsIContent> curContent = do_QueryInterface(inSearchRoot);
-  if (!curContent) return false;
-
-  if (inSearchRoot == inFindElt)
-    return true;
-    
-  // recurse to children
-  PRInt32 numChildren;
-  curContent->ChildCount(numChildren);
-  for (PRInt32 i = 0; i < numChildren; i ++)
-  {
-    nsCOMPtr<nsIContent> curChild;
-    curContent->ChildAt(i, getter_AddRefs(curChild));
-    
-    nsCOMPtr<nsIDOMElement> curElt = do_QueryInterface(curChild);
-    if (ElementIsOrContains(curElt, inFindElt))
-      return true;
-  }
-  
-  return false;
-}
-
-static bool SearchChildrenForMatchingFolder(nsIDOMElement* inCurElt, const nsAString& inAttribute, const nsAString& inValue, nsIDOMElement** foundElt)
-{
-  nsCOMPtr<nsIContent> curContent = do_QueryInterface(inCurElt);
-  if (!curContent) return false;
-  
-  // sanity check
-  nsCOMPtr<nsIAtom> tagName;
-  curContent->GetTag(getter_AddRefs(tagName));
-  if (tagName == BookmarksService::gFolderAtom)
-  {
-    nsAutoString attribValue;
-    inCurElt->GetAttribute(inAttribute, attribValue);
-
-    if (attribValue.Equals(inValue))
-    {
-      *foundElt = inCurElt;
-      NS_ADDREF(*foundElt);
-      return true;
-    }
-  }
-
-  // recurse to children
-  PRInt32 numChildren;
-  curContent->ChildCount(numChildren);
-  for (PRInt32 i = 0; i < numChildren; i ++)
-  {
-    nsCOMPtr<nsIContent> curChild;
-    curContent->ChildAt(i, getter_AddRefs(curChild));
-    
-    nsCOMPtr<nsIDOMElement> curElt = do_QueryInterface(curChild);
-    if (SearchChildrenForMatchingFolder(curElt, inAttribute, inValue, foundElt))
-      return true;
-  }
-  
-  return false;
-}
-
-#pragma mark -
-
-static nsIDocument* gBookmarksDocument = nsnull;
-
-// A dictionary that maps from content IDs (which uniquely identify content nodes)
-// to Obj-C bookmarkItem objects.  These objects are handed back to UI elements like
-// the outline view.
-static NSMutableDictionary* gBookmarkItemDictionary = nil;          // maps content IDs to items
-static NSMutableDictionary* gBookmarkFaviconURLDictionary = nil;    // maps favicon urls to dicts of items
-
-static NSMutableArray* gBookmarkClientsArray = nsnull;
-
-nsIDOMElement* BookmarksService::gToolbarRoot = nsnull;
-nsIDOMElement* BookmarksService::gDockMenuRoot = nsnull;
-
-nsIAtom* BookmarksService::gBookmarkAtom = nsnull;
-nsIAtom* BookmarksService::gDescriptionAtom = nsnull;
-nsIAtom* BookmarksService::gFolderAtom = nsnull;
-nsIAtom* BookmarksService::gSeparatorAtom = nsnull;
-nsIAtom* BookmarksService::gGroupAtom = nsnull;
-nsIAtom* BookmarksService::gHrefAtom = nsnull;
-nsIAtom* BookmarksService::gKeywordAtom = nsnull;
-nsIAtom* BookmarksService::gNameAtom = nsnull;
-nsIAtom* BookmarksService::gOpenAtom = nsnull;
-
-
-BOOL BookmarksService::gBookmarksFileReadOK = NO;
-
-int BookmarksService::CHInsertNone = 0;
-int BookmarksService::CHInsertInto = 1;
-int BookmarksService::CHInsertBefore = 2;
-int BookmarksService::CHInsertAfter = 3;
-
-static NS_DEFINE_CID(kCContentIteratorCID, NS_CONTENTITERATOR_CID);
-
-void
-BookmarksService::Init()
-{
-  static bool sInitted = false;
-  if (sInitted) return;
-  
-  sInitted = true;
-  gBookmarkAtom = NS_NewAtom("bookmark");
-  gFolderAtom = NS_NewAtom("folder");
-  gSeparatorAtom = NS_NewAtom("separator");
-  gNameAtom = NS_NewAtom("name");
-  gHrefAtom = NS_NewAtom("href");
-  gOpenAtom = NS_NewAtom("open");
-  gKeywordAtom = NS_NewAtom("id");
-  gDescriptionAtom = NS_NewAtom("description");
-  gGroupAtom = NS_NewAtom("group");
-  
-  ReadBookmarks();
-}
-
-
-void
-BookmarksService::Shutdown()
-{
-  [gBookmarkClientsArray release];
-  gBookmarkClientsArray = nil;
-  
-  // we should have already written bookmarks in response to a shutdown notification
-  NS_IF_RELEASE(gBookmarksDocument);
-
-  NS_RELEASE(gBookmarkAtom);
-  NS_RELEASE(gFolderAtom);
-  NS_RELEASE(gSeparatorAtom);
-  NS_RELEASE(gNameAtom);
-  NS_RELEASE(gHrefAtom);
-  NS_RELEASE(gOpenAtom);
-  NS_RELEASE(gKeywordAtom);
-  NS_RELEASE(gDescriptionAtom);
-  NS_RELEASE(gGroupAtom);
-  
-  [gBookmarkItemDictionary release];
-  gBookmarkItemDictionary = nil;
-
-  [gBookmarkFaviconURLDictionary release];
-  gBookmarkFaviconURLDictionary = nil;
-}
-
-#pragma mark -
-
-void
-BookmarksService::GetRootContent(nsIContent** aResult)
-{
-  *aResult = nsnull;
-  if (gBookmarksDocument) {
-    nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(gBookmarksDocument));
-    if (!domDoc) return;
-
-    nsCOMPtr<nsIDOMElement> elt;
-    domDoc->GetDocumentElement(getter_AddRefs(elt));
-    if (elt)
-      elt->QueryInterface(NS_GET_IID(nsIContent), (void**)aResult); // Addref happens here.
-  }
-}
-
-BookmarkItem*
-BookmarksService::GetRootItem()
-{
-  nsCOMPtr<nsIContent> rootContent;
-  BookmarksService::GetRootContent(getter_AddRefs(rootContent));
-  BookmarkItem* rootItem = BookmarksService::GetWrapperFor(rootContent);
-  return rootItem;
-}
-
-BookmarkItem*
-BookmarksService::GetWrapperFor(nsIContent* aContent)
-{
-  if ( !aContent )
-    return nil;
-    
-  if (!gBookmarkItemDictionary)
-    gBookmarkItemDictionary = [[NSMutableDictionary alloc] initWithCapacity: 30];
-
-  PRUint32 contentID = 0;
-  aContent->GetContentID(&contentID);
-
-  BookmarkItem* item = BookmarksService::GetWrapperFor(contentID);
-  if (item)
-    return item;
-
-  // Create an item.
-  item = [[BookmarkItem alloc] init]; // The dictionary retains us.
-  [item setContentNode: aContent];
-  [gBookmarkItemDictionary setObject: item forKey: [NSNumber numberWithInt: contentID]];
-  [item release];
-  return item;
-}
-
-BookmarkItem*
-BookmarksService::GetWrapperFor(PRUint32 contentID)
-{
-  return [gBookmarkItemDictionary objectForKey: [NSNumber numberWithUnsignedInt: contentID]];
-}
-
-#pragma mark -
-
-void
-BookmarksService::NotifyBookmarkAdded(nsIContent* aContainer, nsIContent* aChild, PRBool aChangeRoot)
-{
-  unsigned int numClients = [gBookmarkClientsArray count];
-  for (unsigned int i = 0; i < numClients; i ++)
-  {
-    id<BookmarksClient> client = [gBookmarkClientsArray objectAtIndex:i];
-    [client bookmarkAdded:aChild inContainer:aContainer isChangedRoot:aChangeRoot];
-  }
-}
-
-void
-BookmarksService::NotifyBookmarkRemoved(nsIContent* aContainer, nsIContent* aChild, PRBool aChangeRoot)
-{
-  unsigned int numClients = [gBookmarkClientsArray count];
-  for (unsigned int i = 0; i < numClients; i ++)
-  {
-    id<BookmarksClient> client = [gBookmarkClientsArray objectAtIndex:i];
-    [client bookmarkRemoved:aChild inContainer:aContainer isChangedRoot:aChangeRoot];
-  }
-}
-
-typedef void (*BoomarkNotifcation)(nsIContent* aContainer, nsIContent* aChild, PRBool aChangeRoot);
-
-static void
-NotifyDescendents(nsIContent* aChangeParent, nsIContent *aChangeContent, PRBool aChangeRoot, BoomarkNotifcation changeFunction)
-{
-  if (!aChangeContent) return;
-  
-  // notify for this
-  (*changeFunction)(aChangeParent, aChangeContent, aChangeRoot);
-
-  // notify children
-  PRInt32 childCount;
-  aChangeContent->ChildCount(childCount);
-  
-  for (PRInt32 i = 0; i < childCount; i++)
-  {
-    nsCOMPtr<nsIContent> child;
-    aChangeContent->ChildAt(i, getter_AddRefs(child));
-    NotifyDescendents(aChangeContent, child, PR_FALSE, changeFunction);
-  }
-}
-
-void
-BookmarksService::BookmarkAdded(nsIContent* aContainer, nsIContent* aChild, bool shouldFlush)
-{
-  NotifyDescendents(aContainer, aChild, PR_TRUE, NotifyBookmarkAdded);
-  
-  if (shouldFlush)
-    FlushBookmarks();  
-}
-
-void
-BookmarksService::BookmarkRemoved(nsIContent* aContainer, nsIContent* aChild, bool shouldFlush)
-{
-  NotifyDescendents(aContainer, aChild, PR_TRUE, NotifyBookmarkRemoved);
-
-  // remove the bookmark item after everyone has been notified
-  PRUint32 contentID = 0;
-  aChild->GetContentID(&contentID);
-  // the BookmarkItem is released here
-  [gBookmarkItemDictionary removeObjectForKey:[NSNumber numberWithInt:contentID]];
-
-  if (shouldFlush)
-      FlushBookmarks();
-}
-
-void
-BookmarksService::BookmarkChanged(nsIContent* aItem, bool shouldFlush)
-{
-  if (!gBookmarkItemDictionary)
-    return;
-
-  unsigned int numClients = [gBookmarkClientsArray count];
-  for (unsigned int i = 0; i < numClients; i ++)
-  {
-    id<BookmarksClient> client = [gBookmarkClientsArray objectAtIndex:i];
-    [client bookmarkChanged:aItem];
-  }
-
-  if (shouldFlush)
-    FlushBookmarks();  
-}
-
-void
-BookmarksService::SpecialBookmarkChanged(EBookmarksFolderType aFolderType, nsIContent* aNewContent)
-{
-  unsigned int numClients = [gBookmarkClientsArray count];
-  for (unsigned int i = 0; i < numClients; i ++)
-  {
-    id<BookmarksClient> client = [gBookmarkClientsArray objectAtIndex:i];
-    [client specialFolder:aFolderType changedTo:aNewContent];
-  }
-}
-
-#pragma mark -
-
-void
-BookmarksService::AddBookmarkToFolder(const nsString& aURL, const nsString& aTitle, nsIDOMElement* aFolder, nsIDOMElement* aBeforeElt)
-{
-  // XXX if no folder provided, default to root folder
-  if (!aFolder) return;
-  
-  nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(gBookmarksDocument));
-  if (!domDoc) return;
-  
-  nsCOMPtr<nsIDOMElement> elt;
-  domDoc->CreateElementNS(NS_LITERAL_STRING("http://chimera.mozdev.org/bookmarks/"),
-                          NS_LITERAL_STRING("bookmark"),
-                          getter_AddRefs(elt));
-
-  elt->SetAttribute(NS_LITERAL_STRING("name"), aTitle);
-  elt->SetAttribute(NS_LITERAL_STRING("href"), aURL);
-
-  MoveBookmarkToFolder(elt, aFolder, aBeforeElt);
-}
-
-void
-BookmarksService::MoveBookmarkToFolder(nsIDOMElement* aBookmark, nsIDOMElement* aFolder, nsIDOMElement* aBeforeElt)
-{
-  if (!aBookmark || !aFolder) return;
-  
-  nsCOMPtr<nsIDOMNode> oldParent;
-  aBookmark->GetParentNode(getter_AddRefs(oldParent));
-
-  nsCOMPtr<nsIDOMNode> dummy;
-  if (oldParent) {
-    nsCOMPtr<nsIDOMNode> bookmarkNode = do_QueryInterface(aBookmark);
-    oldParent->RemoveChild(bookmarkNode, getter_AddRefs(dummy));
-  }
-
-  if (aBeforeElt) {
-    aFolder->InsertBefore(aBookmark, aBeforeElt, getter_AddRefs(dummy));
-  } else {
-    aFolder->AppendChild(aBookmark, getter_AddRefs(dummy));
-  }
-  
-  nsCOMPtr<nsIContent> childContent(do_QueryInterface(aBookmark));
-  nsCOMPtr<nsIContent> parentContent(do_QueryInterface(aFolder));
-
-  if (oldParent) {
-    nsCOMPtr<nsIContent> oldParentContent(do_QueryInterface(oldParent));
-    BookmarkRemoved(oldParentContent, childContent);
-  }
-  
-  BookmarkAdded(parentContent, childContent);
-}
-
-void
-BookmarksService::DeleteBookmark(nsIDOMElement* aBookmark)
-{
-  if (!aBookmark || aBookmark == gToolbarRoot) return;
-  
-  if (ElementIsOrContains(aBookmark, gDockMenuRoot))
-  {
-    gDockMenuRoot = gToolbarRoot;
-    nsCOMPtr<nsIContent> menuRootContent = do_QueryInterface(gDockMenuRoot);
-    BookmarksService::SpecialBookmarkChanged(eBookmarksFolderDockMenu, menuRootContent);
-  }
-
-  nsCOMPtr<nsIDOMNode> oldParent;
-  aBookmark->GetParentNode(getter_AddRefs(oldParent));
-
-  if (oldParent) {
-    nsCOMPtr<nsIDOMNode> dummy;
-    nsCOMPtr<nsIDOMNode> bookmarkNode = do_QueryInterface(aBookmark);
-    oldParent->RemoveChild(bookmarkNode, getter_AddRefs(dummy));
-
-    nsCOMPtr<nsIContent> childContent(do_QueryInterface(aBookmark));
-    nsCOMPtr<nsIContent> oldParentContent(do_QueryInterface(oldParent));
-    BookmarkRemoved(oldParentContent, childContent);
-  }
-}
-
-static PRBool
-CheckXMLDocumentParseSuccessful(nsIDOMDocument* inDOMDoc)
-{
-  if (!inDOMDoc)
-    return PR_FALSE;
-  
-  nsCOMPtr<nsIDOMElement> docElement;
-  inDOMDoc->GetDocumentElement(getter_AddRefs(docElement));
-  if (!docElement)
-    return PR_FALSE;
-  
-  nsCOMPtr<nsIAtom> tagName;
-  nsCOMPtr<nsIContent>   docContent = do_QueryInterface(docElement);
-  docContent->GetTag(getter_AddRefs(tagName));
-
-  nsCOMPtr<nsIAtom>	parserErrorAtom = do_GetAtom("parsererror");
-  return (tagName != parserErrorAtom);
-}
-
-static PRBool
-ValidateXMLDocument(nsIDOMDocument* inDOMDoc)
-{
-  if (!inDOMDoc)
-    return PR_FALSE;
-
-  nsCOMPtr<nsIDOMElement> elt;
-  inDOMDoc->GetDocumentElement(getter_AddRefs(elt));
-  if (!elt)
-    return PR_FALSE;
-
-  nsCOMPtr<nsIDOMSerializer> domSerializer = do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID);
-  if (!domSerializer)
-    return PR_FALSE;
-  
-  nsXPIDLString encodedDocStr;
-  nsresult rv = domSerializer->SerializeToString(inDOMDoc, getter_Copies(encodedDocStr));
-  if (NS_FAILED(rv))
-    return PR_FALSE;
-  
-  nsCOMPtr<nsIDOMParser> domParser = do_CreateInstance(NS_DOMPARSER_CONTRACTID);
-  if (!domParser)
-    return PR_FALSE;
-
-  nsCOMPtr<nsIDOMDocument> newDomDoc;
-  domParser->ParseFromString(encodedDocStr.get(), "text/xml", getter_AddRefs(newDomDoc));
-  return CheckXMLDocumentParseSuccessful(newDomDoc);
-  
-  return PR_FALSE;
-}
-
-void
-BookmarksService::ReadBookmarks()
-{
-  nsCOMPtr<nsIFile> profileDirBookmarks;
-  NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDirBookmarks));
-  if (!profileDirBookmarks) return;
-  
-  profileDirBookmarks->Append(NS_LITERAL_STRING("bookmarks.xml"));
-  
-  PRBool fileExists = PR_FALSE;
-  profileDirBookmarks->Exists(&fileExists);
-  
-  // If the bookmarks file does not exist, copy from the defaults so we don't
-  // crash or anything dumb like that.
-  if (!fileExists) {
-    nsCOMPtr<nsIFile> defaultBookmarksFile;
-    NS_GetSpecialDirectory(NS_APP_PROFILE_DEFAULTS_50_DIR, getter_AddRefs(defaultBookmarksFile));
-    defaultBookmarksFile->Append(NS_LITERAL_STRING("bookmarks.xml"));
-      
-    nsCOMPtr<nsIFile> profileDirectory;
-    NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(profileDirectory));
-  
-    defaultBookmarksFile->CopyToNative(profileDirectory, NS_LITERAL_CSTRING("bookmarks.xml"));
-  }
-  
-  nsCAutoString bookmarksFileURL;
-  NS_GetURLSpecFromFile(profileDirBookmarks, bookmarksFileURL);
-  
-  nsCOMPtr<nsIURI> uri;
-  NS_NewURI(getter_AddRefs(uri), bookmarksFileURL.get());
-  
-  // XXX this is somewhat lame. we have no way of knowing whether or not the parse succeeded
-  //     or failed. sigh.
-  // Actually, we do. We check for a root <parsererror> node. This relies on the XMLContentSink
-  // behaviour.
-  nsCOMPtr<nsIDOMDocument> bookmarksDOMDoc;
-  nsCOMPtr<nsISyncLoadDOMService> loader = do_GetService("@mozilla.org/content/syncload-dom-service;1");
-  if (loader)
-  {
-    nsCOMPtr<nsIChannel> channel;
-    NS_NewChannel(getter_AddRefs(channel), uri, nsnull, nsnull);
-    if (channel)
-    {
-      loader->LoadLocalDocument(channel, nsnull, getter_AddRefs(bookmarksDOMDoc));
-      if (bookmarksDOMDoc)
-        CallQueryInterface(bookmarksDOMDoc, &gBookmarksDocument);  // addrefs
-    }
-  }
-
-  // test for a parser error. The XML parser replaces the document with one
-  // that has a <parsererror> node as the root.
-  BOOL validBookmarksFile = CheckXMLDocumentParseSuccessful(bookmarksDOMDoc);
-  
-  if (!validBookmarksFile)
-  {
-    // uh oh, parser error, or we just failed to load it. Throw some UI
-    NSString *alert     = NSLocalizedString(@"CorruptedBookmarksAlert",@"");
-    NSString *message   = NSLocalizedString(@"CorruptedBookmarksMsg",@"");
-    NSString *okButton  = NSLocalizedString(@"OKButtonText",@"");
-    NSRunAlertPanel(alert, message, okButton, nil, nil);
-
-    // save the error to a file so the user can see what's wrong
-    SaveBookmarksToFile(NS_LITERAL_STRING("bookmarks_parse_error.xml"));
-
-    // maybe we should read the default bookmarks here?
-    gBookmarksFileReadOK = PR_FALSE;
-    return;
-  }
-  
-  gBookmarksFileReadOK = PR_TRUE;
-  
-  // strip whitespace here, so we don't have to deal with
-  // whitespace nodes elsewhere in the code.
-  {
-    nsCOMPtr<nsIDOMNode> docNode = do_QueryInterface(gBookmarksDocument);
-    StripWhitespaceDOMNodes(docNode);
-  }  
-  
-  nsCOMPtr<nsIContent> rootNode;
-  GetRootContent(getter_AddRefs(rootNode));
-  
-  EnsureToolbarRoot();
-}
-
-void
-BookmarksService::FlushBookmarks()
-{
-  // XXX we need to insert a mechanism here to ensure that we don't write corrupt
-  //     bookmarks files (e.g. full disk, program crash, whatever), because our
-  //     error handling in the parse stage is NON-EXISTENT.
-  //  This is now partially handled by looking for a <parsererror> node at read time.
-  if (!gBookmarksFileReadOK)
-    return;
-  
-  SaveBookmarksToFile(NS_LITERAL_STRING("bookmarks.xml"));
-}
-
-nsresult
-BookmarksService::ExportBookmarksToHTML(const nsAString& inFilePath)
-{
-  nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(gBookmarksDocument);
-  
-  nsresult rv = NS_ERROR_OUT_OF_MEMORY;
-  BookmarksExport* exporter = new BookmarksExport(domDoc);
-  if (exporter)
-    rv = exporter->ExportBookmarksToHTML(inFilePath);
-  
-  delete exporter;
-  return rv;
-}
-
-nsresult
-BookmarksService::SaveBookmarksToFile(const nsAString& inFileName)
-{
-  nsCOMPtr<nsIFile> bookmarksTempFile;
-  nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(bookmarksTempFile));
-  if (NS_FAILED(rv))
-    return rv;
-
-  bookmarksTempFile->Append(NS_LITERAL_STRING("_bookmarks_temp.bak"));
-  
-  nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(gBookmarksDocument));
-  if (!domDoc) {
-    NSLog(@"No bookmarks document to save!");
-    return NS_ERROR_FAILURE;
-  }
-
-  PRBool writeDocType = PR_TRUE;
-
-  // write a docType if we didn't read one in (to convert older BM files)
-  nsCOMPtr<nsIDOMDocumentType> docType;
-  domDoc->GetDoctype(getter_AddRefs(docType));
-  if (docType)
-    writeDocType = PR_FALSE;		// maybe check the type too?
-
-  nsCOMPtr<nsIOutputStream> outputStream;
-  rv = NS_NewLocalFileOutputStream(getter_AddRefs(outputStream), bookmarksTempFile);
-  if (NS_FAILED(rv)) return rv;
-
-  if (writeDocType)
-  {
-    const char* const kDocTypeString = "<!DOCTYPE bookmarks SYSTEM \"http://www.mozilla.org/DTDs/ChimeraBookmarks.dtd\">\n";
-    PRUint32 bytesWritten = 0;
-    rv = outputStream->Write(kDocTypeString, strlen(kDocTypeString), &bytesWritten);
-    if (NS_FAILED(rv)) return rv;
-  }
-  
-  nsCOMPtr<nsIDOMSerializer> domSerializer(do_CreateInstance(NS_XMLSERIALIZER_CONTRACTID));
-  if (domSerializer)
-    rv = domSerializer->SerializeToStream(domDoc, outputStream, "UTF-8");
-  
-  if (NS_SUCCEEDED(rv))
-  {
-    // if the save was OK, now move the file to the final location
-    nsCOMPtr<nsIFile> oldBookmarksFile;
-    rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(oldBookmarksFile));
-    if (NS_FAILED(rv)) return rv;
-    oldBookmarksFile->Append(inFileName);
-    
-    // nuke the old file
-    oldBookmarksFile->Remove(PR_FALSE);
-    
-    // rename the temp file to the final name
-    bookmarksTempFile->MoveTo(NULL, inFileName);
-  }
-  
-  return NS_OK;
-}
-
-NSImage*
-BookmarksService::CreateIconForBookmark(nsIDOMElement* aElement, PRBool useSiteIcon)
-{
-  nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
-  if (content)
-  {
-    nsCOMPtr<nsIAtom> tagName;
-    content->GetTag(getter_AddRefs(tagName));
-  
-    nsAutoString group;
-    content->GetAttr(kNameSpaceID_None, gGroupAtom, group);
-    if (!group.IsEmpty())
-      return [NSImage imageNamed:@"groupbookmark"];
-  
-    if (tagName == BookmarksService::gFolderAtom)
-      return [NSImage imageNamed:@"folder"];
-    
-    // fire off a site icon load
-    if (useSiteIcon && [[BookmarksManager sharedBookmarksManager] useSiteIcons])
-    {
-      nsAutoString href;
-      content->GetAttr(kNameSpaceID_None, gHrefAtom, href);
-      if (href.Length() > 0)
-      {
-        BookmarkItem* contentItem = BookmarksService::GetWrapperFor(content);
-        if ([contentItem siteIcon])
-          return [contentItem siteIcon];
-        
-        if (contentItem && ![contentItem siteIcon])
-          [[BookmarksManager sharedBookmarksManager] loadProxyImageFor:contentItem withURI:[NSString stringWith_nsAString:href]];
-      }
-    }
-  }
-  return [NSImage imageNamed:@"smallbookmark"];
-}
-
-static bool AttributeStringContainsValue(const nsAString& inAttribute, const nsAString& inValue)
-{
-  nsAutoString attributeString(inAttribute);
-  attributeString.StripWhitespace();
-
-  PRInt32 begin = 0;
-  PRInt32 len = attributeString.Length();
-  while (begin < len)
-  {
-    PRInt32 end = attributeString.FindChar(PRUnichar(','), begin);
-    if (end == kNotFound)
-      end = len;
-    if (Substring(attributeString, begin, end - begin).Equals(inValue))
-      return true;
-
-    begin = end + 1;
-  }
-
-  return false;
-}
-
-bool BookmarksService::FindFolderWithAttribute(const nsAString& inAttribute, const nsAString& inValue, nsIDOMElement** foundElt)
-{
-  nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(gBookmarksDocument));
-  if (!domDoc) return false;
-  
-  nsCOMPtr<nsIDOMElement> rootElt;
-  domDoc->GetDocumentElement(getter_AddRefs(rootElt));
-
-  return SearchChildrenForMatchingFolder(rootElt, inAttribute, inValue, foundElt);
-}
-
-void BookmarksService::EnsureToolbarRoot()
-{
-  if (!gBookmarksDocument) return;
-  
-  if (!gToolbarRoot)
-  {
-    nsCOMPtr<nsIDOMElement> foundElt;
-    FindFolderWithAttribute(NS_LITERAL_STRING("type"), NS_LITERAL_STRING("toolbar"), getter_AddRefs(foundElt));
-    if (foundElt)
-      gToolbarRoot = foundElt;
-
-    if (!gToolbarRoot)
-    {
-      NSLog(@"Repairing personal toolbar");
-      nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(gBookmarksDocument);
-
-      nsCOMPtr<nsIDOMElement> rootElt;
-      domDoc->GetDocumentElement(getter_AddRefs(rootElt));
-
-      nsCOMPtr<nsIDOMElement> elt;
-      domDoc->CreateElementNS(NS_LITERAL_STRING("http://chimera.mozdev.org/bookmarks/"),
-                              NS_LITERAL_STRING("folder"),
-                              getter_AddRefs(elt));
-  
-      elt->SetAttribute(NS_LITERAL_STRING("name"), NS_LITERAL_STRING("Toolbar Bookmarks"));
-      elt->SetAttribute(NS_LITERAL_STRING("type"), NS_LITERAL_STRING("toolbar"));
-  
-      nsCOMPtr<nsIDOMNode> dummy;
-      rootElt->AppendChild(elt, getter_AddRefs(dummy));
-      gToolbarRoot = elt;
-    }
-  }
-  
-  if (!gDockMenuRoot)
-  {
-    nsCOMPtr<nsIDOMElement> foundElt;
-    FindFolderWithAttribute(NS_LITERAL_STRING("dockmenu"), NS_LITERAL_STRING("true"), getter_AddRefs(foundElt));
-    if (foundElt)
-      gDockMenuRoot = foundElt;
-    
-    if (!gDockMenuRoot)
-      gDockMenuRoot = gToolbarRoot;
-  }
-}
-
-
-void BookmarksService::SetDockMenuRoot(nsIContent* inDockRootContent)
-{
-  if (!inDockRootContent)
-  {
-    // we allow it to be set to nil
-      if (gDockMenuRoot)
-        gDockMenuRoot->RemoveAttribute(NS_LITERAL_STRING("dockmenu"));
-      gDockMenuRoot = nil;
-      BookmarksService::SpecialBookmarkChanged(eBookmarksFolderDockMenu, nil);
-  }
-  else
-  {
-    // sanity check
-    nsCOMPtr<nsIAtom> tagName;
-    inDockRootContent->GetTag(getter_AddRefs(tagName));
-  
-    nsAutoString group;
-    inDockRootContent->GetAttr(kNameSpaceID_None, gGroupAtom, group);
-  
-    nsCOMPtr<nsIDOMElement> dockRootElement = do_QueryInterface(inDockRootContent);
-    
-    if (dockRootElement && group.IsEmpty() && tagName == gFolderAtom)
-    {
-      // remove the attribute from the old node
-      if (gDockMenuRoot)
-        gDockMenuRoot->RemoveAttribute(NS_LITERAL_STRING("dockmenu"));
-      // set the attribute on the new node
-      dockRootElement->SetAttribute(NS_LITERAL_STRING("dockmenu"), NS_LITERAL_STRING("true"));
-      
-      gDockMenuRoot = dockRootElement;
-      BookmarksService::SpecialBookmarkChanged(eBookmarksFolderDockMenu, inDockRootContent);
-    }
-  }
-}
-
-void BookmarksService::SetToolbarRoot(nsIContent* inToolbarRootContent)
-{
-  if (!inToolbarRootContent) return;
-
-  // sanity check
-  nsCOMPtr<nsIAtom> tagName;
-  inToolbarRootContent->GetTag(getter_AddRefs(tagName));
-
-  nsAutoString group;
-  inToolbarRootContent->GetAttr(kNameSpaceID_None, gGroupAtom, group);
-
-  nsCOMPtr<nsIDOMElement> toolbarRootElement = do_QueryInterface(inToolbarRootContent);
-  
-  if (toolbarRootElement && group.IsEmpty() && tagName == gFolderAtom)
-  {
-    // remove the attribute from the old node
-    if (gToolbarRoot)
-      gToolbarRoot->RemoveAttribute(NS_LITERAL_STRING("type"));
-    // set the attribute on the new node
-    toolbarRootElement->SetAttribute(NS_LITERAL_STRING("type"), NS_LITERAL_STRING("toolbar"));
-
-    gToolbarRoot = toolbarRootElement;
-    BookmarksService::SpecialBookmarkChanged(eBookmarksFolderToolbar, inToolbarRootContent);
-  }
-}
-
-static void GetImportTitle(nsIDOMElement* aSrc, nsString& aTitle)
-{
-  aTitle.Truncate(0);
-  nsCOMPtr<nsIDOMNode> curr;
-  aSrc->GetFirstChild(getter_AddRefs(curr));
-  while (curr) {
-    nsCOMPtr<nsIDOMCharacterData> charData(do_QueryInterface(curr));
-    if (charData) {
-      nsAutoString data;
-      charData->GetData(data);
-      aTitle += data;
-    }
-    else {
-      // Handle Omniweb's nesting of <a> inside <h3> for its folders.
-      nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(curr));
-      if (elt) {
-        nsAutoString localName;
-        elt->GetLocalName(localName);
-        ToLowerCase(localName);
-        if (localName.Equals(NS_LITERAL_STRING("a"))) {
-          aTitle = NS_LITERAL_STRING("");
-          return GetImportTitle(elt, aTitle);
-        }
-      }
-    }
-    
-    nsCOMPtr<nsIDOMNode> temp = curr;
-    temp->GetNextSibling(getter_AddRefs(curr));
-  }
-}
-
-// sniff for control chars, which are defined to be in the range U+0000 to U+001F and U+007F to U+009F.
-static PRBool ContainsControlChars(const nsString& inString)
-{
-  PRUint16 *c = (PRUint16*)inString.get();  // be sure to get unsigned
-  PRUint16 *cEnd = c + inString.Length();   // use Length, rather than looking for null byte,
-                                            // because there may be extra nulls at the end.
-  
-  while (c < cEnd)
-  {
-    if ((*c <= 0x001F) || (*c >= 0x007F && *c <= 0x009F))
-      return PR_TRUE;
-    c ++;
-  }
-  
-  return PR_FALSE;
-}
-
-static void CleanControlChars(nsString& ioString)
-{
-  if (ContainsControlChars(ioString))
-  {
-    // strip control chars here. this is inefficient, but does it matter?
-    NSString* cleanedTitle  = [[NSString stringWith_nsAString: ioString]
-                stringByReplacingCharactersInSet:[NSCharacterSet controlCharacterSet] withString:@""];
-    [cleanedTitle assignTo_nsAString:ioString];
-    NSLog(@"Removed control characters from bookmark string '%@'", cleanedTitle);
-  }
-}
-
-static void CreateBookmark(nsIDOMElement* aSrc, nsIDOMElement* aDst,
-                           nsIDOMDocument* aDstDoc, PRBool aIsFolder,
-                           nsIDOMElement** aResult)
-{
-  nsAutoString tagName(NS_LITERAL_STRING("bookmark"));
-  if (aIsFolder)
-    tagName = NS_LITERAL_STRING("folder");
-
-  aDstDoc->CreateElementNS(NS_LITERAL_STRING("http://chimera.mozdev.org/bookmarks/"),
-                           tagName,
-                           aResult); // Addref happens here.
-
-  nsAutoString title;
-  GetImportTitle(aSrc, title);
-  CleanControlChars(title);
-
-  (*aResult)->SetAttribute(NS_LITERAL_STRING("name"), title);
-
-  if (!aIsFolder) {
-    nsAutoString href;
-    aSrc->GetAttribute(NS_LITERAL_STRING("href"), href);
-    CleanControlChars(href);
-    (*aResult)->SetAttribute(NS_LITERAL_STRING("href"), href);
-  }
-
-  nsCOMPtr<nsIDOMNode> dummy;
-  aDst->AppendChild(*aResult, getter_AddRefs(dummy));
-}
-
-static void AddImportedHTMLBookmarks(nsIDOMElement* aSrc, nsIDOMElement* aDst, nsIDOMDocument* aDstDoc,
-                                 PRInt32& aBookmarksType)
-{
-  nsAutoString localName;
-  aSrc->GetLocalName(localName);
-  ToLowerCase(localName);
-  nsCOMPtr<nsIDOMElement> newBookmark;
-  if (localName.Equals(NS_LITERAL_STRING("bookmarkinfo")))
-    aBookmarksType = 1; // Omniweb.
-  else if (localName.Equals(NS_LITERAL_STRING("dt"))) {
-    // We have found either a folder or a leaf.
-    nsCOMPtr<nsIDOMNode> curr;
-    aSrc->GetFirstChild(getter_AddRefs(curr));
-    while (curr) {
-      nsCOMPtr<nsIDOMElement> childElt(do_QueryInterface(curr));
-      if (childElt) {
-        childElt->GetLocalName(localName);
-        ToLowerCase(localName);
-        if (localName.Equals(NS_LITERAL_STRING("a"))) {
-          // Guaranteed to be a bookmark in IE.  Could be either in Omniweb.
-          nsCOMPtr<nsIDOMElement> dummy;
-          CreateBookmark(childElt, aDst, aDstDoc, PR_FALSE, getter_AddRefs(dummy));
-        }
-        // Ignore the H3 we encounter.  This will be dealt with later.
-      }
-      nsCOMPtr<nsIDOMNode> temp = curr;
-      temp->GetNextSibling(getter_AddRefs(curr));
-    }
-  }
-  else if (localName.Equals(NS_LITERAL_STRING("dl"))) {
-    // The children of a folder.  Recur inside.
-    // Locate the parent to create the folder.
-    nsCOMPtr<nsIDOMNode> node;
-    aSrc->GetPreviousSibling(getter_AddRefs(node));
-    nsCOMPtr<nsIDOMElement> folderElt(do_QueryInterface(node));
-    if (folderElt) {
-      // Make sure it's an H3 folder in Mozilla and IE.  In Mozilla it will probably have an ID.
-      PRBool hasID;
-      folderElt->HasAttribute(NS_LITERAL_STRING("ID"), &hasID);
-      if (aBookmarksType != 1) {
-        if (hasID)
-          aBookmarksType = 2; // Mozilla
-        else
-          aBookmarksType = 0; // IE
-      }
-      nsAutoString localName;
-      folderElt->GetLocalName(localName);
-      ToLowerCase(localName);
-      if (localName.Equals(NS_LITERAL_STRING("h3")))
-        CreateBookmark(folderElt, aDst, aDstDoc, PR_TRUE, getter_AddRefs(newBookmark));
-    }
-    if (!newBookmark)
-      newBookmark = aDst;
-    // Recur over all our children.
-    nsCOMPtr<nsIDOMNode> curr;
-    aSrc->GetFirstChild(getter_AddRefs(curr));
-    while (curr) {
-      nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(curr));
-      if (elt)
-        AddImportedHTMLBookmarks(elt, newBookmark, aDstDoc, aBookmarksType);
-      nsCOMPtr<nsIDOMNode> temp = curr;
-      temp->GetNextSibling(getter_AddRefs(curr));
-    }
-  }
-  else {
-    // Recur over all our children.
-    nsCOMPtr<nsIDOMNode> curr;
-    aSrc->GetFirstChild(getter_AddRefs(curr));
-    while (curr) {
-      nsCOMPtr<nsIDOMElement> elt(do_QueryInterface(curr));
-      if (elt)
-        AddImportedHTMLBookmarks(elt, aDst, aDstDoc, aBookmarksType);
-      nsCOMPtr<nsIDOMNode> temp = curr;
-      temp->GetNextSibling(getter_AddRefs(curr));
-    }
-  }
-}
-
-static PRBool
-AddImportedChimeraXMLBookmarks(nsIDOMDocument* inImportDoc, nsIDOMDocument* inDestDoc, nsIDOMElement* inImportedRoot)
-{
-  if (!inImportedRoot) return PR_FALSE;
-  
-  PRBool isChimeraBookmarks = PR_TRUE;		// default to yes, and keep fingers crossed
-  nsCOMPtr<nsIDOMDocumentType> docType;
-  inImportDoc->GetDoctype(getter_AddRefs(docType));
-
-  if (docType)
-  {
-    nsAutoString systemIDString;
-    docType->GetSystemId(systemIDString);
-    if (!systemIDString.Equals(NS_LITERAL_STRING("http://www.mozilla.org/DTDs/ChimeraBookmarks.dtd")))
-      return PR_FALSE;
-  }
-  
-  // check that the root element is <bookmarks>
-  if (isChimeraBookmarks)
-  {
-    nsCOMPtr<nsIDOMElement> importRootElement;
-    inImportDoc->GetDocumentElement(getter_AddRefs(importRootElement));
-
-    nsAutoString rootTagName;
-    importRootElement->GetTagName(rootTagName);
-    if (!rootTagName.Equals(NS_LITERAL_STRING("bookmarks")))
-      return PR_FALSE;
-  }
-
-  // we now have a valid (we think) chimera bookmarks XML DOM. We need to
-  // move all of the children of the root into the new folder, taking care
-  // to fix up ContentIDs (since moving elements between documents does not
-  // ensure unique IDs for us, sadly).
-  nsCOMPtr<nsIDOMElement> importRoot;
-  inImportDoc->GetDocumentElement(getter_AddRefs(importRoot));
-  if (!importRoot) return PR_FALSE;
-  
-  // remove all whitespace nodes
-  nsCOMPtr<nsIDOMNode> rootNode = do_QueryInterface(importRoot);
-  StripWhitespaceDOMNodes(rootNode);
-  
-  nsCOMPtr<nsIContent> rootContent = do_QueryInterface(importRoot);
-  if (!rootContent) return PR_FALSE;
-
-  PRInt32 numChildren;
-  rootContent->ChildCount(numChildren);
-  for (PRInt32 i = 0; i < numChildren; i ++)
-  {
-    nsCOMPtr<nsIContent> curChild;
-    rootContent->ChildAt(i, getter_AddRefs(curChild));
-  
-    // clone it, and put it under the importedRoot.
-    nsCOMPtr<nsIDOMElement> childElement = do_QueryInterface(curChild);
-    if (childElement)
-    {
-      nsCOMPtr<nsIDOMNode> clonedChild;
-      childElement->CloneNode(PR_TRUE, getter_AddRefs(clonedChild));
-      
-      nsCOMPtr<nsIDOMNode> dummy;
-      inImportedRoot->AppendChild(clonedChild, getter_AddRefs(dummy));
-    }
-  }
-
-  // now nuke the contentIDs
-  // XXX we should nuke any "type=toolbar" attributes that we find.
-  nsCOMPtr<nsIDocument> importDoc = do_QueryInterface(inDestDoc);
-
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIContentIterator> iterator = do_CreateInstance(kCContentIteratorCID);
-  if (iterator)
-  {
-    nsCOMPtr<nsIContent> root = do_QueryInterface(inImportedRoot);
-  
-    rv = iterator->Init(root);
-    if (NS_FAILED(rv))
-      return PR_FALSE;
-      
-    while (iterator->IsDone() == NS_ENUMERATOR_FALSE)
-    {
-      nsCOMPtr<nsIContent> curContent;
-      iterator->CurrentNode(getter_AddRefs(curContent));
-
-      if (curContent)
-      {
-        PRInt32 newID;
-        importDoc->GetAndIncrementContentID(&newID);
-        curContent->SetContentID((PRUint32)newID);
-      }
-      
-      iterator->Next();
-    }
-  }
-  
-  return PR_TRUE;
-}
-
-void
-BookmarksService::ImportBookmarks(nsIDOMDocument* inImportDoc)
-{
-  nsCOMPtr<nsIDOMElement>  bookmarksRoot;
-  nsCOMPtr<nsIDOMDocument> bookmarksDOMDoc(do_QueryInterface(gBookmarksDocument));
-  if (!bookmarksDOMDoc) return;
-  
-  bookmarksDOMDoc->GetDocumentElement(getter_AddRefs(bookmarksRoot));
-
-  nsCOMPtr<nsIDOMNode> dummy;
-  
-  // Create the root of the new bookmarks by hand.
-  nsCOMPtr<nsIDOMElement> importedRootElement;
-  bookmarksDOMDoc->CreateElementNS(	NS_LITERAL_STRING("http://chimera.mozdev.org/bookmarks/"),
-                                      NS_LITERAL_STRING("folder"),
-                                      getter_AddRefs(importedRootElement));
-  
-  // Now crawl through the file and look for <DT> elements.  They signify folders
-  // or leaves.
-  PRInt32 bookmarksType = 0; // Assume IE.
-  
-  nsCOMPtr<nsIDOMHTMLDocument> htmlDoc = do_QueryInterface(inImportDoc);
-  if (htmlDoc)
-  {
-    // HTML bookmarks (IE, Mozilla, Omniweb)
-    nsCOMPtr<nsIDOMElement> htmlDocRoot;
-    htmlDoc->GetDocumentElement(getter_AddRefs(htmlDocRoot));
-    AddImportedHTMLBookmarks(htmlDocRoot, importedRootElement, bookmarksDOMDoc, bookmarksType);
-  }
-  else
-  {
-    // XML bookmarks. Chimera (we hope)
-    if (!AddImportedChimeraXMLBookmarks(inImportDoc, bookmarksDOMDoc, importedRootElement))
-    {
-      NSString *alert     = NSLocalizedString(@"ErrorImportingBookmarksAlert",@"");
-      NSString *message   = NSLocalizedString(@"ErrorImportingXMLBookmarksMsg",@"");
-      NSString *okButton  = NSLocalizedString(@"OKButtonText",@"");
-      NSRunAlertPanel(alert, message, okButton, nil, nil);
-      return;
-    }
-    
-    bookmarksType = 3;
-  }
-  
-  if (bookmarksType == 0)
-    importedRootElement->SetAttribute(NS_LITERAL_STRING("name"), NS_LITERAL_STRING("Internet Explorer Favorites"));
-  else if (bookmarksType == 1)
-    importedRootElement->SetAttribute(NS_LITERAL_STRING("name"), NS_LITERAL_STRING("Omniweb Bookmarks"));
-  else if (bookmarksType == 2)
-    importedRootElement->SetAttribute(NS_LITERAL_STRING("name"), NS_LITERAL_STRING("Mozilla/Netscape Bookmarks"));
-  else if (bookmarksType == 3)
-    importedRootElement->SetAttribute(NS_LITERAL_STRING("name"), NS_LITERAL_STRING("Navigator Bookmarks"));
-
-  // now put the new child into the doc, and validate it
-  bookmarksRoot->AppendChild(importedRootElement, getter_AddRefs(dummy));
-
-  PRBool bookmarksGood = ValidateXMLDocument(bookmarksDOMDoc);
-  if (!bookmarksGood) {
-    // uh oh, parser error. Remove the new node, and then throw some UI
-    bookmarksRoot->RemoveChild(importedRootElement, getter_AddRefs(dummy));
-        
-    NSString *alert     = NSLocalizedString(@"ErrorImportingBookmarksAlert",@"");
-    NSString *message   = NSLocalizedString(@"ErrorImportingBookmarksMsg",@"");
-    NSString *okButton  = NSLocalizedString(@"OKButtonText",@"");
-    NSRunAlertPanel(alert, message, okButton, nil, nil);
-    return;
-  }
-
-  // Now do a notification that the root Favorites folder got added.  This
-  // will update all our views.
-  nsCOMPtr<nsIContent> parentContent(do_QueryInterface(bookmarksRoot));
-  nsCOMPtr<nsIContent> childContent(do_QueryInterface(importedRootElement));
-  
-#if 0
-  // XXX testing
-  if (gBookmarkItemDictionary)
-    [gBookmarkItemDictionary removeAllObjects];
-#endif
-
-  // this will save the file
-  BookmarkAdded(parentContent, childContent, true /* flush */);
-}
- 
-bool
-BookmarksService::GetContentForKeyword(NSString* aKeyword, nsIContent** outFoundContent)
-{
-  nsAutoString keyword;
-  [aKeyword assignTo_nsAString:keyword];
-
-  if (keyword.IsEmpty())
-    return false;
-  
-  nsCOMPtr<nsIDOMDocument> domDoc(do_QueryInterface(gBookmarksDocument));
-  if (!domDoc) return false;
-
-  nsCOMPtr<nsIContent> foundContent;
-
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIContentIterator> iterator = do_CreateInstance(kCContentIteratorCID);
-  if (iterator)
-  {
-    nsCOMPtr<nsIContent> root;
-    GetRootContent(getter_AddRefs(root));
-  
-    rv = iterator->Init(root);
-    if (NS_FAILED(rv))
-      return false;
-      
-    while (iterator->IsDone() == NS_ENUMERATOR_FALSE)
-    {
-      nsCOMPtr<nsIContent> curContent;
-      iterator->CurrentNode(getter_AddRefs(curContent));
-
-      if (curContent)
-      {
-        nsAutoString keywordValue;
-        curContent->GetAttr(kNameSpaceID_None, gKeywordAtom, keywordValue);
-        if (keywordValue.Equals(keyword))
-        {
-          foundContent = curContent;
-          break;
-        }
-      }
-      
-      iterator->Next();
-    }
-  }
-  
-  NS_IF_ADDREF(*outFoundContent = foundContent);
-  return (foundContent != NULL);
-}
-
-// Is searchItem equal to bookmark or bookmark's parent, grandparent, etc?
-bool
-BookmarksService::DoAncestorsIncludeNode(BookmarkItem* bookmark, BookmarkItem* searchItem)
-{
-  nsCOMPtr<nsIContent> search = [searchItem contentNode];
-  nsCOMPtr<nsIContent> current = [bookmark contentNode];
-  nsCOMPtr<nsIContent> root;
-  GetRootContent(getter_AddRefs(root));
-    
-  // If the search item is the root node, return yes immediatly
-  if (search == root)
-    return true;
-
-  //  for each ancestor
-  while (current) {
-    // If this is the root node we can't search farther, and there was no match
-    if (current == root)
-      return false;
-    
-    // If the two nodes match, then the search term is an ancestor of the given bookmark
-    if (search == current)
-      return true;
-
-    // If a match wasn't found, set up the next node to compare
-    current = current->GetParent();
-  }
-  
-  return false;
-}
-
-
-#ifdef FILTER_DESCENDANT_ON_DRAG
-/*
-this has been disabled because it is too slow, and can cause a large
-delay when the user is dragging lots of items.  this needs to get
-fixed someday.
-
-It should filter out every node whose parent is also being dragged.
-*/
-
-NSArray*
-BookmarksService::FilterOutDescendantsForDrag(NSArray* nodes)
-{
-  NSMutableArray *toDrag = [NSMutableArray arrayWithArray: nodes];
-  unsigned int i = 0;
-
-  while (i < [toDrag count]) {
-    BookmarkItem* item = [toDrag objectAtIndex: i];
-    bool matchFound = false;
-    
-    for (unsigned int j = 0; j < [toDrag count] && matchFound == NO; j++) {
-      if (i != j) // Don't compare to self, will always match
-        matchFound = BookmarksService::DoAncestorsIncludeNode(item, [toDrag objectAtIndex: j]);
-    }
-    
-    //  if a match was found, remove the node from the array
-    if (matchFound)
-      [toDrag removeObjectAtIndex: i];
-    else
-      i++;
-  }
-  
-  return toDrag;
-}
-#endif
-
-bool
-BookmarksService::IsBookmarkDropValid(BookmarkItem* proposedParent, int index, NSArray* draggedIDs, bool isCopy)
-{
-  if ( !draggedIDs )
-    return false;
-
-  NSMutableArray *draggedItems = [NSMutableArray arrayWithCapacity: [draggedIDs count]];
-  BOOL toolbarRootMoving = NO;
-  
-  BOOL          haveCommonParent = YES;
-  BookmarkItem* commonDragParent = nil;
-  
-  for (unsigned int i = 0; i < [draggedIDs count]; i++)
-  {
-    NSNumber* contentID = [draggedIDs objectAtIndex: i];
-    BookmarkItem* bookmarkItem = BookmarksService::GetWrapperFor([contentID unsignedIntValue]);
-    nsCOMPtr<nsIContent> itemContent = [bookmarkItem contentNode];    
-    nsCOMPtr<nsIDOMElement> itemElement(do_QueryInterface(itemContent));
-
-    if (itemElement == BookmarksService::gToolbarRoot)
-      toolbarRootMoving = YES;
-
-    if (bookmarkItem)
-      [draggedItems addObject: bookmarkItem];
-    
-    if (haveCommonParent)
-    {
-      if (!commonDragParent)
-        commonDragParent = [bookmarkItem parentItem];
-      else if ([bookmarkItem parentItem] != commonDragParent)
-      {
-        commonDragParent = nil;
-        haveCommonParent = NO;
-      }
-    }
-  }
-
-  // if there is only one item being dragged (or, if items are contiguous),
-  // prevent drops which would not affect the final order
-  if (haveCommonParent && (commonDragParent == proposedParent))
-  {
-    // XXX bail for now if > 1 being dragged. For the correct feedback when > 1 item is
-    // selected, we should reject drags when the source items are contiguous (under the
-    // same parent), and the target is within their range.
-    if (!isCopy && [draggedItems count] == 1)
-    {
-      BookmarkItem* draggedItem = [draggedItems objectAtIndex:0];
-      nsCOMPtr<nsIContent> parentContent = [draggedItem contentNode]->GetParent();
-      if (parentContent)
-      {
-        PRInt32 childIndex = parentContent->IndexOf([draggedItem contentNode]);
-        if (childIndex == index || (childIndex + 1) == index)
-          return false;
-      }
-    }
-  }
-
-  // If we are being dropped into the top level, allow it
-  if ([proposedParent contentNode] == [BookmarksService::GetRootItem() contentNode])
-    return true;
-    
-  // If we are not being dropped on the top level, and the toolbar root is being moved, disallow
-  if (toolbarRootMoving)
-    return false;
-
-  // Make sure that we are not being dropped into one of our own children
-  // If the proposed parent, or any of it's ancestors matches one of the nodes being dragged
-  // then deny the drag.
-  for (unsigned int i = 0; i < [draggedItems count]; i++)
-  {
-    if (BookmarksService::DoAncestorsIncludeNode(proposedParent, [draggedItems objectAtIndex: i]))
-      return false;
-  }
-    
-  return true;
-}
-
-
-bool
-BookmarksService::PerformProxyDrop(BookmarkItem* parentItem, BookmarkItem* beforeItem, NSDictionary* data)
-{
-  if ( !data )
-    return NO;
-
-  nsCOMPtr<nsIDOMElement> parentElt;
-  parentElt = do_QueryInterface([parentItem contentNode]);
-
-  nsCOMPtr<nsIDOMElement> beforeElt;
-  beforeElt = do_QueryInterface([beforeItem contentNode]);
-
-  nsAutoString url; [[data objectForKey:@"url"] assignTo_nsAString:url];
-  nsAutoString title; [[data objectForKey:@"title"] assignTo_nsAString:title];
-  BookmarksService::AddBookmarkToFolder(url, title, parentElt, beforeElt);
-  return YES;  
-}
-
-
-bool
-BookmarksService::PerformBookmarkDrop(BookmarkItem* parent, BookmarkItem* beforeItem, int index, NSArray* draggedIDs, bool doCopy)
-{
-  NSEnumerator *enumerator = [draggedIDs reverseObjectEnumerator];
-  NSNumber *contentID;
-  
-  //  for each item being dragged
-  while ( (contentID = [enumerator nextObject]) )
-  {  
-    //  get dragged node
-    nsCOMPtr<nsIContent> draggedNode = [GetWrapperFor([contentID unsignedIntValue]) contentNode];
-    
-    //  get the dragged nodes parent
-    nsCOMPtr<nsIContent> draggedParent;
-    if (draggedNode)
-      draggedParent = draggedNode->GetParent();
-
-    //  get the proposed parent
-    nsCOMPtr<nsIContent> proposedParent = [parent contentNode];
-
-    PRInt32 existingIndex = 0;
-    if (draggedParent)
-      existingIndex = draggedParent->IndexOf(draggedNode);
-    
-    //  if the deleted nodes parent and the proposed parents are equal
-    //  and if the deleted point is earlier in the list than the inserted point
-    if (!doCopy && proposedParent == draggedParent && existingIndex < index)
-      index--;  //  if so, move the inserted point up one to compensate
-    
-    //  remove it from the tree
-    if (draggedNode != proposedParent)		// paranoia. This should never happen
-    {
-      nsCOMPtr<nsIAtom> tagName;
-      draggedNode->GetTag(getter_AddRefs(tagName));
-      bool srcIsFolder = (tagName == BookmarksService::gFolderAtom);
-
-      if (doCopy && !srcIsFolder)
-      {
-        // need to clone
-        nsCOMPtr<nsIDOMElement> srcElement = do_QueryInterface(draggedNode);
-        nsCOMPtr<nsIDOMElement> destParent = do_QueryInterface(proposedParent);
-        
-        nsAutoString title;
-        nsAutoString href;
-        srcElement->GetAttribute(NS_LITERAL_STRING("href"), href);
-        srcElement->GetAttribute(NS_LITERAL_STRING("name"), title);
-
-        nsCOMPtr<nsIDOMElement> beforeElt = do_QueryInterface([beforeItem contentNode]);
-        AddBookmarkToFolder(href, title, destParent, beforeElt);
-      }
-      else
-      {
-        if (draggedParent)
-          draggedParent->RemoveChildAt(existingIndex, PR_TRUE);
-        BookmarkRemoved(draggedParent, draggedNode, false);
-        
-        //  insert into new position
-        if (proposedParent)
-          proposedParent->InsertChildAt(draggedNode, index, PR_TRUE, PR_TRUE);
-        BookmarkAdded(proposedParent, draggedNode, false);
-      }
-    }
-  }
-
-  FlushBookmarks();
-  
-  return true;
-}
-
-bool
-BookmarksService::PerformURLDrop(BookmarkItem* parentItem, BookmarkItem* beforeItem, NSString* inTitle, NSString* inUrl) 
-{
-  if ( !inUrl || [inUrl length] == 0 )
-    return NO;
-
-  nsCOMPtr<nsIDOMElement> parentElt;
-  parentElt = do_QueryInterface([parentItem contentNode]);
-
-  nsCOMPtr<nsIDOMElement> beforeElt;
-  beforeElt = do_QueryInterface([beforeItem contentNode]);
-
-  nsAutoString url;   [inUrl assignTo_nsAString:url];
-  nsAutoString title; [inTitle assignTo_nsAString:title];
-
-  if (title.Length() == 0)
-    [inUrl assignTo_nsAString:title];
-
-  // we have to be paranoid about adding bad characters to the XML DOM here, because
-  // that will cause our XML file to not validate when it's read in
-  CleanControlChars(url);
-  CleanControlChars(title);
-
-  BookmarksService::AddBookmarkToFolder(url, title, parentElt, beforeElt);
-  return YES;  
-}
-
-
-#pragma mark -
-
-@interface BookmarkItem(Private)
-
-@end
-
-
-@implementation BookmarkItem
-
--(void)dealloc
-{
-  [mSiteIcon release];
-  [super dealloc];
-}
-
--(nsIContent*)contentNode
-{
-  return mContentNode;		// no addreffing
-}
-
-- (NSNumber*)contentID
-{
-  PRUint32 contentID = 0;
-  mContentNode->GetContentID(&contentID);
-  return [NSNumber numberWithInt: (int)contentID];
-}
-
-- (int)intContentID
-{
-  PRUint32 contentID = 0;
-  mContentNode->GetContentID(&contentID);
-  return (int)contentID;
-}
-
-- (NSString*)getAttributeValue:(nsIAtom*)atom
-{
-  if (mContentNode)
-  {
-    nsAutoString attributeString;
-    mContentNode->GetAttr(kNameSpaceID_None, atom, attributeString);
-    return [NSString stringWith_nsAString: attributeString];
-  }
-  return @"";
-}
-
-- (void)setAttribute:(nsIAtom*)atom toValue:(NSString*)value
-{
-  if (mContentNode)
-  {
-    nsAutoString attrString;
-    [value assignTo_nsAString:attrString];
-    mContentNode->SetAttr(kNameSpaceID_None, atom, attrString, PR_TRUE);
-  }
-}
-
-- (NSString *)description
-{
-  NSString* info = [self getAttributeValue:BookmarksService::gNameAtom];
-  return [NSString stringWithFormat:@"<BookmarkItem, name = \"%@\">", info];
-}
-
-- (NSString*)name
-{
-  return [self getAttributeValue:BookmarksService::gNameAtom];
-}
-
-- (NSString *)url
-{
-  return [self getAttributeValue:BookmarksService::gHrefAtom];
-}
-
-- (NSString*)keyword
-{
-  return [self getAttributeValue:BookmarksService::gKeywordAtom];
-}
-
-- (NSString*)descriptionString
-{
-  return [self getAttributeValue:BookmarksService::gDescriptionAtom];
-}
-
-- (void)setName:(NSString*)inName
-{
-  [self setAttribute:BookmarksService::gNameAtom toValue:inName];
-}
-
-- (void)setUrl:(NSString*)inName
-{
-  [self setAttribute:BookmarksService::gHrefAtom toValue:inName];
-}
-
-- (void)setKeyword:(NSString*)inName
-{
-  [self setAttribute:BookmarksService::gKeywordAtom toValue:inName];
-}
-
-- (void)setDescriptionString:(NSString*)inName
-{
-  [self setAttribute:BookmarksService::gDescriptionAtom toValue:inName];
-}
-
-- (void)setSiteIcon:(NSImage*)image
-{
-  [mSiteIcon autorelease];
-  mSiteIcon = [image retain];
-}
-
-- (NSImage*)siteIcon
-{
-  return mSiteIcon;
-}
-
-- (void)itemChanged:(BOOL)flushBookmarks
-{
-  BookmarksService::BookmarkChanged(mContentNode, flushBookmarks);
-}
-
-- (void)remove
-{
-  nsCOMPtr<nsIDOMElement> bookmarkElt = do_QueryInterface(mContentNode);
-  BookmarksService::DeleteBookmark(bookmarkElt);
-}
-
--(void)setContentNode: (nsIContent*)aContentNode
-{
-  mContentNode = aContentNode;		// no addreffing
-}
-
-- (id)copyWithZone:(NSZone *)aZone
-{
-  BookmarkItem* copy = [[[self class] allocWithZone: aZone] init];
-  [copy setContentNode: mContentNode];
-  [copy setSiteIcon: mSiteIcon];
-  return copy;
-}
-
-- (BOOL)isFolder
-{
-  nsCOMPtr<nsIAtom> tagName;
-  mContentNode->GetTag(getter_AddRefs(tagName));
-  return (tagName == BookmarksService::gFolderAtom);
-}
-
-- (BOOL)isGroup
-{
-  nsCOMPtr<nsIAtom> tagName;
-  mContentNode->GetTag(getter_AddRefs(tagName));
-  if (tagName != BookmarksService::gFolderAtom)
-    return NO;
-
-  nsAutoString group;
-  mContentNode->GetAttr(kNameSpaceID_None, BookmarksService::gGroupAtom, group);
-  return !group.IsEmpty();
-}
-
-- (void)setIsGroup:(BOOL)isGroup
-{
-  if (isGroup)
-    mContentNode->SetAttr(kNameSpaceID_None, BookmarksService::gGroupAtom, NS_LITERAL_STRING("true"), PR_TRUE);
-  else
-    mContentNode->UnsetAttr(kNameSpaceID_None, BookmarksService::gGroupAtom, PR_TRUE);
-}
-
-- (BOOL)isExpanded
-{
-  return (BOOL)mContentNode->HasAttr(kNameSpaceID_None, BookmarksService::gOpenAtom);
-}
-
-- (void)setIsExpanded:(BOOL)isExpanded
-{
-  if (isExpanded)
-    mContentNode->SetAttr(kNameSpaceID_None, BookmarksService::gOpenAtom, NS_LITERAL_STRING("true"), PR_FALSE);  
-  else
-    mContentNode->UnsetAttr(kNameSpaceID_None, BookmarksService::gOpenAtom, PR_FALSE);
-}
-
-- (BOOL)isToobarRoot
-{
-  nsCOMPtr<nsIContent> toolbarRoot = do_QueryInterface(BookmarksService::gToolbarRoot);
-  return (mContentNode == toolbarRoot.get());
-}
-
-- (BOOL)isDockMenuRoot
-{
-  nsCOMPtr<nsIContent> dockRoot = do_QueryInterface(BookmarksService::gDockMenuRoot);
-  return (mContentNode == dockRoot.get());
-}
-
-- (BookmarkItem*)parentItem
-{
-  nsCOMPtr<nsIContent> parentContent = mContentNode->GetParent();
-
-  nsCOMPtr<nsIContent> rootContent;
-  BookmarksService::GetRootContent(getter_AddRefs(rootContent));
-
-  // The root has no item
-  if (parentContent != rootContent)
-  {
-    PRUint32 contentID;
-    parentContent->GetContentID(&contentID);
-    return BookmarksService::GetWrapperFor(contentID);
-  }
-  
-  return nil;
-}
-
-- (NSArray*)getChildren
-{
-  PRInt32 numChildren;
-  mContentNode->ChildCount(numChildren);
-  if (numChildren == 0)
-    return nil;
-
-  NSMutableArray* array = [[[NSMutableArray alloc] initWithCapacity:numChildren] autorelease];
-  for (PRInt32 i = 0; i < numChildren; i ++)
-  {
-    nsCOMPtr<nsIContent> childContent;
-    mContentNode->ChildAt(i, getter_AddRefs(childContent));
-    [array addObject:BookmarksService::GetWrapperFor(childContent)];
-  }
-  
-  return array;
-}
-
-- (int)getNumberOfChildren
-{
-  PRInt32 numChildren;
-  mContentNode->ChildCount(numChildren);
-  return numChildren;
-}
-
-@end
-
-
-#pragma mark -
-
-@interface BookmarksManager(Private)
-
-- (void)registerNotificationListener;
-- (void)imageLoadedNotification:(NSNotification*)notification;
-
-- (void)buildFoldersListWalkChildren:(NSMenu*)menu curNode:(nsIContent*)curNode depth:(int)depth;
-- (void)buildFoldersListProcessItem:(NSMenu*)menu curNode:(nsIContent*)curNode depth:(int)depth;
-
-- (nsIDOMElement*)createNewBookmarkElement:(NSString*)urlString title:(NSString*)titleString itemType:(EBookmarkItemType)itemType;
-- (nsIDOMElement*)getNewBookmarkParent:(nsIContent*)inParent;
-
-- (NSString*)expandKeyword:(NSString*)keyword inString:(NSString*)location;
-
-@end
-
-
-@implementation BookmarksManager
-
-enum
-{
-  eSiteLoadingStateNone    = 0,
-  eSiteLoadingStateQueued  = 1,
-  eSiteLoadingStatePending = 2,
-  eSiteLoadingStateLoaded  = 3
-};
-
-static BookmarksManager* gBookmarksManager = nil;
-#if DEBUG
-static BOOL gMadeBMManager;
-#endif
-
-+ (BookmarksManager*)sharedBookmarksManager;
-{
-  if (!gBookmarksManager)
-  {
-#if DEBUG
-    if (gMadeBMManager)
-      NSLog(@"Recreating bookmarks manager on shutdown!");
-    gMadeBMManager = YES;
-#endif
-    gBookmarksManager = [[BookmarksManager alloc] init];
-  }
-  return gBookmarksManager;
-}
-
-+ (BookmarksManager*)sharedBookmarksManagerDontAlloc;
-{
-  return gBookmarksManager;
-}
-
-- (id)init
-{
-  if ((self = [super init]))
-  {
-    [self registerNotificationListener];
-    BookmarksService::Init();
-    [self addBookmarksClient:self];	// we register for callbacks,
-                                    // to keep gBookmarkFaviconURLDictionary in sync
-
-    mUseSiteIcons = [[PreferenceManager sharedInstance] getBooleanPref:"browser.chrome.favicons" withSuccess:NULL];
-  }
-  return self;
-}
-
-- (void)dealloc
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-
-  if (self == gBookmarksManager)
-    gBookmarksManager = nil;
-  [super dealloc];
-}
-
-- (void)loadProxyImageFor:(id)requestor withURI:(NSString*)inURIString
-{	
-  NSString* faviconURL = [SiteIconProvider faviconLocationStringFromURI:inURIString];
-  if ([faviconURL length] == 0)
-    return;
-
-  // to avoid redundant loads, we keep a hash table which maps favicons urls
-  // to NSDictionaries, which in turn contain a state flag, and an array of
-  // UI items that use that url for their favicon.
-  if (!gBookmarkFaviconURLDictionary)
-    gBookmarkFaviconURLDictionary = [[NSMutableDictionary alloc] initWithCapacity:30];
-  
-  int loadingState = eSiteLoadingStateNone;
-
-  // each item is an array of bookmark items
-  NSMutableDictionary* siteDict = [gBookmarkFaviconURLDictionary objectForKey:faviconURL];
-  if (siteDict)
-  {
-    NSMutableArray* siteBookmarks = [siteDict objectForKey:@"sites"];
-    if (![siteBookmarks containsObject:requestor])
-      [siteBookmarks addObject:requestor];
-
-    loadingState = [[siteDict objectForKey:@"state"] intValue];
-  }
-  else
-  {
-    NSMutableArray* siteBookmarks = [[NSMutableArray alloc] initWithObjects:requestor, nil];
-    siteDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                                   siteBookmarks, @"sites",
-                  [NSNumber numberWithInt:eSiteLoadingStateNone], @"state",
-                                                                  nil];
-
-    [gBookmarkFaviconURLDictionary setObject:siteDict forKey:faviconURL];
-  }
-  
-  if (loadingState == eSiteLoadingStateNone)
-  {
-    BOOL startedLoad = [[SiteIconProvider sharedFavoriteIconProvider] loadFavoriteIcon:self
-                              forURI:inURIString
-                              withUserData:faviconURL
-                              allowNetwork:NO];
-
-    if (startedLoad)
-    {
-      loadingState = eSiteLoadingStatePending;
-      [faviconURL retain]; 		// keep alive while the load is active
-    }
-    else
-      loadingState = eSiteLoadingStateLoaded;
-      
-    [siteDict setObject:[NSNumber numberWithInt:loadingState] forKey:@"state"];
-  }
-
-}
-
-- (void)updateProxyImage:(NSImage*)image forSiteIcon:(NSString*)inSiteIconURI
-{
-  if (gBookmarkFaviconURLDictionary)
-  {
-    NSMutableDictionary* siteDict      = [gBookmarkFaviconURLDictionary objectForKey:inSiteIconURI];
-    NSArray*             siteBookmarks = [siteDict objectForKey:@"sites"];
-    if (siteBookmarks)
-    {
-      for (unsigned int i = 0; i < [siteBookmarks count]; i ++)
-      {
-        BookmarkItem* foundItem = [siteBookmarks objectAtIndex:i];
-        if (foundItem)
-        {
-          [foundItem setSiteIcon:image];
-          BookmarksService::BookmarkChanged([foundItem contentNode], FALSE);
-        }
-      }
-    }
-
-    // set the state
-    [siteDict setObject:[NSNumber numberWithInt: eSiteLoadingStateLoaded] forKey:@"state"];
-  }
-}
-
-- (void)registerNotificationListener
-{
-  [[NSNotificationCenter defaultCenter] addObserver:  self
-                                        selector:     @selector(imageLoadedNotification:)
-                                        name:         SiteIconLoadNotificationName
-                                        object:       self];
-
-  [[NSNotificationCenter defaultCenter] addObserver:  self
-                                        selector:     @selector(shutdown:)
-                                        name:         TermEmbeddingNotificationName
-                                        object:       nil];
-}
-
-- (void)shutdown: (NSNotification*)aNotification
-{
-  BookmarksService::FlushBookmarks();
-  BookmarksService::Shutdown();		// need to do this before XPCOM shuts down
-  [self removeBookmarksClient:self];
-  [gBookmarksManager release];
-}
-
-// callback for [[SiteIconProvider sharedFavoriteIconProvider] loadFavoriteIcon]
-- (void)imageLoadedNotification:(NSNotification*)notification
-{
-  NSDictionary* userInfo = [notification userInfo];
-  if (userInfo)
-  {
-    NSString* faviconURL = [userInfo objectForKey:SiteIconLoadUserDataKey];
-  	NSImage*  iconImage  = [userInfo objectForKey:SiteIconLoadImageKey];
-      
-    if (iconImage)
-      [self updateProxyImage:iconImage forSiteIcon:faviconURL];
-    
-    [faviconURL release]; 		// match retain in loadProxyImageFor
-  }
-}
-
-- (void)addBookmarksClient:(id<BookmarksClient>)client
-{
-  if (!gBookmarkClientsArray)
-    gBookmarkClientsArray = [[NSMutableArray alloc] initWithCapacity:4];
-
-  if (![gBookmarkClientsArray containsObject:client])
-    [gBookmarkClientsArray addObject:client];
-}
-
-- (void)removeBookmarksClient:(id<BookmarksClient>)client
-{
-  [gBookmarkClientsArray removeObject:client];
-}
-
-- (BookmarkItem*)getWrapperForContent:(nsIContent*)item
-{
-  return BookmarksService::GetWrapperFor(item);
-}
-
-- (BookmarkItem*)getWrapperForID:(int)contentID
-{
-  return BookmarksService::GetWrapperFor((PRUint32)contentID);
-}
-
-- (BookmarkItem*)getWrapperForNumber:(NSNumber*)contentIDNum
-{
-  return [gBookmarkItemDictionary objectForKey: contentIDNum];
-}
-
-- (nsIContent*)getRootContent
-{
-  nsIContent* rootContent = NULL;
-  BookmarksService::GetRootContent(&rootContent);	// addrefs
-  return rootContent;
-}
-
-- (nsIContent*)getToolbarRoot
-{
-  nsIContent* rootAsContent = NULL;
-  if (BookmarksService::gToolbarRoot)
-    BookmarksService::gToolbarRoot->QueryInterface(nsIContent::GetIID(), (void**)&rootAsContent);
-    
-  return rootAsContent;
-}
-
-- (nsIContent*)getDockMenuRoot
-{
-  nsIContent* rootAsContent = NULL;
-  if (BookmarksService::gDockMenuRoot)
-    BookmarksService::gDockMenuRoot->QueryInterface(nsIContent::GetIID(), (void**)&rootAsContent);
-    
-  return rootAsContent;
-}
-
-- (BookmarkItem*)getRootItem
-{
-  nsCOMPtr<nsIContent> rootContent;
-  BookmarksService::GetRootContent(getter_AddRefs(rootContent));
-  return BookmarksService::GetWrapperFor(rootContent);
-}
-
-- (BookmarkItem*)getToolbarRootItem
-{
-  nsCOMPtr<nsIContent> toolbarRoot = do_QueryInterface(BookmarksService::gToolbarRoot);
-  return BookmarksService::GetWrapperFor(toolbarRoot);
-}
-
-- (BookmarkItem*)getDockMenuRootItem
-{
-  nsCOMPtr<nsIContent> dockRoot = do_QueryInterface(BookmarksService::gDockMenuRoot);
-  return BookmarksService::GetWrapperFor(dockRoot);
-}
-
-- (nsIDOMDocument*)getBookmarksDocument
-{
-  nsIDOMDocument* domDoc = NULL;
-
-  if (gBookmarksDocument)
-    gBookmarksDocument->QueryInterface(nsIDOMDocument::GetIID(), (void**)&domDoc);
-    
-  return domDoc;
-}
-
-- (NSArray*)getBookmarkGroupURIs:(BookmarkItem*)item
-{
-  nsIContent* content = [item contentNode];
-  nsAutoString group;
-  content->GetAttr(kNameSpaceID_None, BookmarksService::gGroupAtom, group);
-  if (group.IsEmpty())
-    return nil;
-
-  PRInt32 numChildren;
-  content->ChildCount(numChildren);
-
-  NSMutableArray* uriArray = [[[NSMutableArray alloc] initWithCapacity:numChildren] autorelease];
-
-  for (PRInt32 i = 0; i < numChildren; i ++)
-  {
-    nsCOMPtr<nsIContent> child;
-    content->ChildAt(i, getter_AddRefs(child));
-
-    nsAutoString href;
-    child->GetAttr(kNameSpaceID_None, BookmarksService::gHrefAtom, href);
-    if (!href.IsEmpty())
-    {
-      NSString* url = [NSString stringWith_nsAString: href];
-      [uriArray addObject:url];
-    }
-  }
-
-  return uriArray;
-}
-
-- (NSString*)expandKeyword:(NSString*)keyword inString:(NSString*)location
-{
-  NSRange matchRange = [location rangeOfString:@"%s"];
-  if (matchRange.location != NSNotFound)
-  {
-    NSString* resultString = [NSString stringWithFormat:@"%@%@%@",
-                [location substringToIndex:matchRange.location],
-                keyword,
-                [location substringFromIndex:(matchRange.location + matchRange.length)]];
-    return resultString;
-  }
-    
-  return location;
-}
-
-
-- (NSArray*)resolveBookmarksKeyword:(NSString*)locationString
-{
-  BookmarkItem* foundItem = nil;
-  nsCOMPtr<nsIContent> foundContent;
-  BookmarksService::GetContentForKeyword(locationString, getter_AddRefs(foundContent));
-  if (foundContent)		// we found an item or tab group with the keyword
-  {
-  	foundItem = BookmarksService::GetWrapperFor(foundContent);
-    if ([foundItem isGroup])
-      return [self getBookmarkGroupURIs:foundItem];
-    else
-      return [NSArray arrayWithObject:[foundItem url]];
-  }
-
-  // we didn't find anything. See if the string contains "<keyword> <value>"
-  NSRange spaceRange = [locationString rangeOfString:@" "];
-  if (spaceRange.location != NSNotFound)
-  {
-    NSString* firstWord  = [locationString substringToIndex:spaceRange.location];
-    NSString* secondWord = [locationString substringFromIndex:(spaceRange.location + spaceRange.length)];
-
-    BookmarksService::GetContentForKeyword(firstWord, getter_AddRefs(foundContent));
-    if (foundContent)
-    {
-      foundItem = BookmarksService::GetWrapperFor(foundContent);
-      if ([foundItem isGroup])
-      {
-        // do keyword expansion on each child
-        PRInt32 numChildren;
-        foundContent->ChildCount(numChildren);
-      
-        NSMutableArray* uriArray = [[[NSMutableArray alloc] initWithCapacity:numChildren] autorelease];
-      
-        for (PRInt32 i = 0; i < numChildren; i ++)
-        {
-          nsCOMPtr<nsIContent> child;
-          foundContent->ChildAt(i, getter_AddRefs(child));
-      
-          nsAutoString href;
-          child->GetAttr(kNameSpaceID_None, BookmarksService::gHrefAtom, href);
-          if (!href.IsEmpty())
-          {
-            NSString* url = [NSString stringWith_nsAString: href];
-            [uriArray addObject:[self expandKeyword:secondWord inString:url]];
-          }
-        }
-    
-        return uriArray;
-      }
-      else
-      {
-        // not a group
-        return [NSArray arrayWithObject:[self expandKeyword:secondWord inString:[foundItem url]]];
-      }
-    }
-  }
-
-  // default return: just the string
-  return [NSArray arrayWithObject:locationString];
-}
-
-- (NSImage*)createIconForBookmarkItem:(BookmarkItem*)inItem useSiteIcon:(BOOL)useSiteIcon
-{
-  if ([inItem isGroup])
-    return [NSImage imageNamed:@"groupbookmark"];
-
-  if ([inItem isFolder])
-    return [NSImage imageNamed:@"folder"];
-
-  // fire off a site icon load
-  if (useSiteIcon && [self useSiteIcons])
-  {
-    if ([inItem siteIcon])
-      return [inItem siteIcon];
-
-    NSString* url = [inItem url];
-    if ([url length] > 0)
-      [self loadProxyImageFor:inItem withURI:url];
-  }
-  return [NSImage imageNamed:@"smallbookmark"];
-}
-
-
-// return value is addreffed
-// XXX factor this code with BookmarksService code
-- (nsIDOMElement*)createNewBookmarkElement:(NSString*)urlString title:(NSString*)titleString itemType:(EBookmarkItemType)itemType
-{
-  nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(gBookmarksDocument);
-  if (!domDoc) return NULL;
-  
-  nsAutoString url, title;
-  if (urlString)
-    [urlString assignTo_nsAString:url];
-  if (titleString)
-    [titleString assignTo_nsAString:title];
-
-  nsAutoString tagName;
-  switch (itemType)
-  {
-    case eBookmarkItemBookmark:
-      tagName = NS_LITERAL_STRING("bookmark");
-      break;
-      
-    case eBookmarkItemSeparator:
-      tagName = NS_LITERAL_STRING("separator");
-      break;
-
-    case eBookmarkItemFolder:
-    case eBookmarkItemGroup:
-      tagName = NS_LITERAL_STRING("folder");
-      break;
-  }
-  
-  nsCOMPtr<nsIDOMElement> newElement;
-  domDoc->CreateElementNS(NS_LITERAL_STRING("http://chimera.mozdev.org/bookmarks/"),
-                          tagName,
-                          getter_AddRefs(newElement));
-  if (!newElement) return NULL;
-  
-  if (itemType != eBookmarkItemSeparator)
-    newElement->SetAttribute(NS_LITERAL_STRING("name"), title);
-
-  if (itemType == eBookmarkItemBookmark)
-    newElement->SetAttribute(NS_LITERAL_STRING("href"), url);
-
-  if (itemType == eBookmarkItemGroup)
-    newElement->SetAttribute(NS_LITERAL_STRING("group"), NS_LITERAL_STRING("true"));
-
-  nsIDOMElement* returnElement = newElement;
-  NS_ADDREF(returnElement);
-  return returnElement;
-}
-
-- (nsIDOMElement*)getNewBookmarkParent:(nsIContent*)inParent
-{
-  nsCOMPtr<nsIContent> parentContent = inParent;
-  if (!parentContent)
-    BookmarksService::GetRootContent(getter_AddRefs(parentContent));
-    
-  nsIDOMElement* parentElement;
-  CallQueryInterface(parentContent, &parentElement);
-  return parentElement;
-}
-
-- (void)addNewBookmark:(NSString*)urlString title:(NSString*)titleString withParent:(nsIContent*)parent
-{
-  nsCOMPtr<nsIDOMElement> parentElement = getter_AddRefs([self getNewBookmarkParent:parent]);
-  if (!parentElement) return;
-
-  nsCOMPtr<nsIDOMElement> newElement = getter_AddRefs(
-      [self createNewBookmarkElement:urlString title:titleString itemType:eBookmarkItemBookmark]);
-  
-  nsCOMPtr<nsIDOMNode> dummy;
-  parentElement->AppendChild(newElement, getter_AddRefs(dummy));
-
-  nsCOMPtr<nsIContent> newChildContent = do_QueryInterface(newElement);
-  nsCOMPtr<nsIContent> parentContent   = do_QueryInterface(parentElement);
-  BookmarksService::BookmarkAdded(parentContent, newChildContent);
-}
-
-- (void)addNewBookmarkFolder:(NSString*)titleString withParent:(nsIContent*)parent
-{
-  nsCOMPtr<nsIDOMElement> parentElement = getter_AddRefs([self getNewBookmarkParent:parent]);
-  if (!parentElement) return;
-
-  nsCOMPtr<nsIDOMElement> newElement = getter_AddRefs(
-      [self createNewBookmarkElement:@"" title:titleString itemType:eBookmarkItemFolder]);
-
-  nsCOMPtr<nsIDOMNode> dummy;
-  parentElement->AppendChild(newElement, getter_AddRefs(dummy));
-
-  nsCOMPtr<nsIContent> newChildContent = do_QueryInterface(newElement);
-  nsCOMPtr<nsIContent> parentContent   = do_QueryInterface(parentElement);
-  BookmarksService::BookmarkAdded(parentContent, newChildContent);
-}
-
-- (void)addNewBookmarkGroup:(NSString*)titleString items:(NSArray*)itemsArray withParent:(nsIContent*)parent
-{
-  nsCOMPtr<nsIDOMElement> parentElement = getter_AddRefs([self getNewBookmarkParent:parent]);
-  if (!parentElement) return;
-
-  nsCOMPtr<nsIDOMElement> newGroupElement = getter_AddRefs(
-      [self createNewBookmarkElement:@"" title:titleString itemType:eBookmarkItemGroup]);
-
-  // create children
-  unsigned int numItems = [itemsArray count];
-  for (unsigned int i = 0; i < numItems; i ++)
-  {
-    NSDictionary* itemDict  = [itemsArray objectAtIndex:i];
-    NSString*     itemTitle = [itemDict objectForKey:@"title"];
-    NSString*     itemHRef  = [itemDict objectForKey:@"href"];
-
-    nsCOMPtr<nsIDOMElement> newElement = getter_AddRefs(
-      [self createNewBookmarkElement:itemHRef title:itemTitle itemType:eBookmarkItemBookmark]);
-
-    if (newElement)
-    {
-      nsCOMPtr<nsIDOMNode> dummy;
-      newGroupElement->AppendChild(newElement, getter_AddRefs(dummy));
-    }
-  }
-
-  nsCOMPtr<nsIDOMNode> dummy;
-  parentElement->AppendChild(newGroupElement, getter_AddRefs(dummy));
-
-  nsCOMPtr<nsIContent> newGroupContent = do_QueryInterface(newGroupElement);
-  nsCOMPtr<nsIContent> parentContent   = do_QueryInterface(parentElement);
-  BookmarksService::BookmarkAdded(parentContent, newGroupContent);
-}
-
-- (void)buildFoldersListWalkChildren:(NSMenu*)menu curNode:(nsIContent*)content depth:(int)depth
-{
-  if (!content) return;
-  
-  // Now walk our children, and for folders also recur into them.
-  PRInt32 childCount;
-  content->ChildCount(childCount);
-  
-  for (PRInt32 i = 0; i < childCount; i++)
-  {
-    nsCOMPtr<nsIContent> child;
-    content->ChildAt(i, getter_AddRefs(child));
-    [self buildFoldersListProcessItem:menu curNode:child depth:depth];
-  }
-}
-
-- (void)buildFoldersListProcessItem:(NSMenu*)menu curNode:(nsIContent*)content depth:(int)depth
-{
-  if (!content) return;
-  
-  nsCOMPtr<nsIAtom> tagName;
-  content->GetTag(getter_AddRefs(tagName));
-
-  nsAutoString group;
-  if (tagName == BookmarksService::gFolderAtom)
-    content->GetAttr(kNameSpaceID_None, BookmarksService::gGroupAtom, group);
-
-  BOOL isFolder = (tagName == BookmarksService::gFolderAtom);
-  BOOL isGroup  = isFolder && !group.IsEmpty();
-
-  if (isFolder && !isGroup) // folder
-  {
-    // add it
-    nsAutoString name;
-    content->GetAttr(kNameSpaceID_None, BookmarksService::gNameAtom, name);
-
-    NSString* 				itemName 	= [[NSString stringWith_nsAString: name] stringByTruncatingTo:80 at:kTruncateAtMiddle];
-    NSMutableString*	title 		= [NSMutableString stringWithString:itemName];
-
-    for (int j = 0; j <= depth; ++j) 
-      [title insertString:@"    " atIndex: 0];
-
-    NSMenuItem* menuItem = [[[NSMenuItem alloc] initWithTitle: title action: NULL keyEquivalent: @""] autorelease];
-    
-    PRUint32 contentID;
-    content->GetContentID(&contentID);
-    [menuItem setTag: contentID];
-    
-    [menu addItem: menuItem];
-
-    [self buildFoldersListWalkChildren:menu curNode:content depth:depth+1];
-  }
-}
-
-- (void)buildFlatFolderList:(NSMenu*)menu fromRoot:(nsIContent*)rootContent
-{
-  nsCOMPtr<nsIContent> startContent = rootContent;
-  if (!startContent)
-    BookmarksService::GetRootContent(getter_AddRefs(startContent));
-  
-  [self buildFoldersListWalkChildren:menu curNode:startContent depth:0];
-}
-
-- (BOOL)useSiteIcons
-{
-  return mUseSiteIcons;
-}
-
-#pragma mark -
-
-- (void)bookmarkAdded:(nsIContent*)bookmark inContainer:(nsIContent*)container isChangedRoot:(BOOL)isRoot
-{
-  // nothing to do
-}
-
-- (void)bookmarkRemoved:(nsIContent*)bookmark inContainer:(nsIContent*)container isChangedRoot:(BOOL)isRoot
-{
-  if (!bookmark) return;	// paranoia
-  PRUint32 contentID = 0;
-  bookmark->GetContentID(&contentID);
-
-  BookmarkItem* bmItem = [self getWrapperForID:contentID];
-
-  NSString* faviconURL    = [SiteIconProvider faviconLocationStringFromURI:[bmItem url]];
-  NSDictionary* siteDict  = [gBookmarkFaviconURLDictionary objectForKey:faviconURL];
-  if (siteDict)
-  {
-    NSMutableArray*  siteBookmarks = [siteDict objectForKey:@"sites"];
-    [siteBookmarks removeObject:bmItem];
-    
-    if ([siteBookmarks count] == 0)
-      [gBookmarkFaviconURLDictionary removeObjectForKey:faviconURL];	// release the dict too
-  }
-}
-
-- (void)bookmarkChanged:(nsIContent*)bookmark
-{
-  // nothing to do
-}
-
-- (void)specialFolder:(EBookmarksFolderType)folderType changedTo:(nsIContent*)newFolderContent
-{
-  // nothing to do
-}
-
-@end
-