more cleanup

git-svn-id: svn://10.0.0.236/branches/alecf_urlbarcleanup@89710 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/client.mk

@@ -1,816 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Stephen Lamm
-#   Benjamin Smedberg <bsmedberg@covad.net>
-#   Chase Phillips <chase@mozilla.org>
-#
-# 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 *****
-
-# Build a mozilla application.
-#
-# To checkout and build a tree,
-#    1. cvs co mozilla/client.mk
-#    2. cd mozilla
-#    3. create your .mozconfig file with
-#       mk_add_options MOZ_CO_PROJECT=suite,browser,mail,minimo,xulrunner
-#    4. gmake -f client.mk 
-#
-# This script will pick up the CVSROOT from the CVS/Root file. If you wish
-# to use a different CVSROOT, you must set CVSROOT in your environment:
-#
-#   export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-#   export CVSROOT=:pserver:username%somedomain.org@cvs.mozilla.org:/cvsroot
-# 
-# You must specify which products/modules you wish to checkout, with
-#   MOZ_CO_PROJECT, MOZ_CO_MODULE, and BUILD_MODULES variables.
-#
-#   MOZ_CO_PROJECT possibilities include the following:
-#     suite (Seamonkey suite)
-#     browser (aka Firefox)
-#     mail (aka Thunderbird)
-#     minimo (small browser for devices)
-#     composer (standalone composer, aka NVU)
-#     calendar (aka Sunbird, use this to build the calendar extensions also)
-#     xulrunner
-#     macbrowser (aka Camino)
-#
-# Other common MOZ_CO_MODULE options include the following:
-#   mozilla/other-licenses/libart_lgpl
-#   mozilla/other-licenses/bsdiff
-#   mozilla/tools/codesighs
-#
-# Other targets (gmake -f client.mk [targets...]),
-#    checkout
-#    build
-#    clean (realclean is now the same as clean)
-#    distclean
-#
-# See http://www.mozilla.org/build/ for more information.
-#
-# Options:
-#   MOZ_OBJDIR           - Destination object directory
-#   MOZ_CO_DATE          - Date tag to use for checkout (default: none)
-#   MOZ_CO_MODULE        - Module to checkout
-#   MOZ_CVS_FLAGS        - Flags to pass cvs (default: -q -z3)
-#   MOZ_CO_FLAGS         - Flags to pass after 'cvs co' (default: -P)
-#   MOZ_MAKE_FLAGS       - Flags to pass to $(MAKE)
-#   MOZ_CO_LOCALES       - localizations to pull (MOZ_CO_LOCALES="de-DE,pt-BR")
-#   MOZ_LOCALE_DIRS      - directories which contain localizations
-#   LOCALES_CVSROOT      - CVSROOT to use to pull localizations
-#
-
-AVAILABLE_PROJECTS = \
-  all \
-  suite \
-  toolkit \
-  browser \
-  mail \
-  minimo \
-  composer \
-  calendar \
-  xulrunner \
-  macbrowser \
-  $(NULL)
-
-MODULES_core :=                                 \
-  SeaMonkeyAll                                  \
-  mozilla/browser/config/version.txt            \
-  mozilla/mail/config/version.txt               \
-  mozilla/ipc/ipcd                              \
-  mozilla/modules/libpr0n                       \
-  mozilla/modules/libmar                        \
-  mozilla/modules/libbz2                        \
-  mozilla/accessible                            \
-  mozilla/security/manager                      \
-  mozilla/toolkit                               \
-  mozilla/storage                               \
-  mozilla/db/sqlite3                            \
-  $(NULL)
-
-LOCALES_core :=                                 \
-  netwerk                                       \
-  dom                                           \
-  $(NULL)
-
-MODULES_toolkit :=                              \
-  $(MODULES_core)                               \
-  mozilla/chrome                                \
-  $(NULL)
-
-LOCALES_toolkit :=                              \
-  $(LOCALES_core)                               \
-  toolkit                                       \
-  security/manager                              \
-  $(NULL)
-
-MODULES_suite :=                                \
-  $(MODULES_core)                               \
-  mozilla/suite                                 \
-  $(NULL)
-
-LOCALES_suite :=                                \
-  $(LOCALES_core)                               \
-  $(NULL)
-
-MODULES_browser :=                              \
-  $(MODULES_toolkit)                            \
-  mozilla/browser                               \
-  mozilla/other-licenses/branding/firefox       \
-  mozilla/other-licenses/7zstub/firefox         \
-  $(NULL)
-
-LOCALES_browser :=                              \
-  $(LOCALES_toolkit)                            \
-  browser                                       \
-  other-licenses/branding/firefox               \
-  $(NULL)
-
-BOOTSTRAP_browser := mozilla/browser/config/mozconfig
-
-MODULES_minimo :=                               \
-  $(MODULES_toolkit)                            \
-  mozilla/minimo                                \
-  $(NULL)
-
-MODULES_mail :=                                 \
-  $(MODULES_toolkit)                            \
-  mozilla/mail                                  \
-  mozilla/other-licenses/branding/thunderbird   \
-  mozilla/other-licenses/7zstub/thunderbird     \
-  $(NULL)
-
-LOCALES_mail :=                                 \
-  $(LOCALES_toolkit)                            \
-  mail                                          \
-  other-licenses/branding/thunderbird           \
-  editor/ui                                     \
-  $(NULL)
-
-BOOTSTRAP_mail := mozilla/mail/config/mozconfig
-
-MODULES_composer :=                             \
-  $(MODULES_toolkit)                            \
-  mozilla/composer                              \
-  $(NULL)
-
-MODULES_calendar :=                             \
-  $(MODULES_toolkit)                            \
-  mozilla/storage                               \
-  mozilla/db/sqlite3                            \
-  mozilla/calendar                              \
-  $(NULL)
-
-BOOTSTRAP_calendar := mozilla/calendar/sunbird/config/mozconfig
-
-MODULES_xulrunner :=                            \
-  $(MODULES_toolkit)                            \
-  mozilla/xulrunner                             \
-  $(NULL)
-
-LOCALES_xulrunner :=                            \
-  $(LOCALES_toolkit)                            \
-  $(NULL)
-
-BOOTSTRAP_xulrunner := mozilla/xulrunner/config/mozconfig
-
-MODULES_macbrowser :=                           \
-  $(MODULES_core)                               \
-  mozilla/camino                                \
-  $(NULL)
-
-BOOTSTRAP_macbrowser := mozilla/camino/config/mozconfig
-
-MODULES_all :=                                  \
-  mozilla/other-licenses/bsdiff                 \
-  mozilla/other-licenses/libart_lgpl            \
-  mozilla/tools/trace-malloc                    \
-  mozilla/tools/jprof                           \
-  mozilla/tools/codesighs                       \
-  mozilla/tools/update-packaging                \
-  mozilla/other-licenses/branding               \
-  mozilla/other-licenses/7zstub                 \
-  $(NULL)
-
-#######################################################################
-# Checkout Tags
-#
-# For branches, uncomment the MOZ_CO_TAG line with the proper tag,
-# and commit this file on that tag.
-MOZ_CO_TAG           = MOZILLA_1_8_BRANCH
-NSPR_CO_TAG          = MOZILLA_1_8_BRANCH
-NSS_CO_TAG           = MOZILLA_1_8_BRANCH
-LDAPCSDK_CO_TAG      = MOZILLA_1_8_BRANCH
-LOCALES_CO_TAG       = MOZILLA_1_8_BRANCH
-
-BUILD_MODULES = all
-
-#######################################################################
-# Defines
-#
-CVS = cvs
-comma := ,
-
-CWD := $(shell pwd)
-
-ifeq "$(CWD)" "/"
-CWD   := /.
-endif
-
-ifneq (, $(wildcard client.mk))
-# Ran from mozilla directory
-ROOTDIR   := $(shell dirname $(CWD))
-TOPSRCDIR := $(CWD)
-else
-# Ran from mozilla/.. directory (?)
-ROOTDIR   := $(CWD)
-TOPSRCDIR := $(CWD)/mozilla
-endif
-
-# on os2, TOPSRCDIR may have two forward slashes in a row, which doesn't
-#  work;  replace first instance with one forward slash
-TOPSRCDIR := $(shell echo "$(TOPSRCDIR)" | sed -e 's%//%/%')
-
-ifndef TOPSRCDIR_MOZ
-TOPSRCDIR_MOZ=$(TOPSRCDIR)
-endif
-
-# if ROOTDIR equals only drive letter (i.e. "C:"), set to "/"
-DIRNAME := $(shell echo "$(ROOTDIR)" | sed -e 's/^.://')
-ifeq ($(DIRNAME),)
-ROOTDIR := /.
-endif
-
-AUTOCONF := autoconf
-MKDIR := mkdir
-SH := /bin/sh
-ifndef MAKE
-MAKE := gmake
-endif
-
-CONFIG_GUESS_SCRIPT := $(wildcard $(TOPSRCDIR)/build/autoconf/config.guess)
-ifdef CONFIG_GUESS_SCRIPT
-  CONFIG_GUESS = $(shell $(CONFIG_GUESS_SCRIPT))
-else
-  _IS_FIRST_CHECKOUT := 1
-endif
-
-####################################
-# CVS
-
-# Add the CVS root to CVS_FLAGS if needed
-CVS_ROOT_IN_TREE := $(shell cat $(TOPSRCDIR)/CVS/Root 2>/dev/null)
-ifneq ($(CVS_ROOT_IN_TREE),)
-ifneq ($(CVS_ROOT_IN_TREE),$(CVSROOT))
-  CVS_FLAGS := -d $(CVS_ROOT_IN_TREE)
-endif
-endif
-
-CVS_CO_DATE_FLAGS = $(if $(MOZ_CO_DATE),-D "$(MOZ_CO_DATE)")
-CVSCO = $(CVS) $(CVS_FLAGS) co $(MOZ_CO_FLAGS) $(if $(MOZ_CO_TAG),-r $(MOZ_CO_TAG)) $(CVS_CO_DATE_FLAGS)
-
-CVSCO_LOGFILE := $(ROOTDIR)/cvsco.log
-CVSCO_LOGFILE := $(shell echo $(CVSCO_LOGFILE) | sed s%//%/%)
-
-# if LOCALES_CVSROOT is not specified, set it here
-# (and let mozconfig override it)
-LOCALES_CVSROOT ?= :pserver:anonymous@cvs-mirror.mozilla.org:/l10n
-
-####################################
-# Load mozconfig Options
-
-# See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
-
-MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
-MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find 
-MOZCONFIG_MODULES := mozilla/build/unix/modules.mk mozilla/build/unix/uniq.pl
-run_for_side_effects := \
-  $(shell cd $(ROOTDIR); \
-     if test "$(_IS_FIRST_CHECKOUT)"; then \
-        $(CVSCO) $(MOZCONFIG_FINDER) $(MOZCONFIG_LOADER) $(MOZCONFIG_MODULES); \
-     else true; \
-     fi; \
-     $(MOZCONFIG_LOADER) $(TOPSRCDIR) mozilla/.mozconfig.mk > mozilla/.mozconfig.out)
-include $(TOPSRCDIR)/.mozconfig.mk
-include $(TOPSRCDIR)/build/unix/modules.mk
-
-####################################
-# Options that may come from mozconfig
-
-MOZ_PROJECT_LIST := $(subst $(comma), ,$(MOZ_CO_PROJECT))
-
-ifneq (,$(filter-out $(AVAILABLE_PROJECTS),$(MOZ_PROJECT_LIST)))
-$(error MOZ_CO_PROJECT contains an unrecognized project.)
-endif
-
-ifeq (all,$(filter all,$(MOZ_PROJECT_LIST)))
-  MOZ_PROJECT_LIST := $(AVAILABLE_PROJECTS)
-endif
-
-MOZ_MODULE_LIST := $(subst $(comma), ,$(MOZ_CO_MODULE)) $(foreach project,$(MOZ_PROJECT_LIST),$(MODULES_$(project)))
-LOCALE_DIRS := $(MOZ_LOCALE_DIRS) $(foreach project,$(MOZ_PROJECT_LIST),$(LOCALES_$(project)))
-
-MOZCONFIG_MODULES += $(foreach project,$(MOZ_PROJECT_LIST),$(BOOTSTRAP_$(project)))
-
-# Using $(sort) here because it also removes duplicate entries.
-MOZ_MODULE_LIST := $(sort $(MOZ_MODULE_LIST))
-LOCALE_DIRS := $(sort $(LOCALE_DIRS))
-MOZCONFIG_MODULES := $(sort $(MOZCONFIG_MODULES))
-
-# Change CVS flags if anonymous root is requested
-ifdef MOZ_CO_USE_MIRROR
-  CVS_FLAGS := -d :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
-endif
-
-# MOZ_CVS_FLAGS - Basic CVS flags
-ifeq "$(origin MOZ_CVS_FLAGS)" "undefined"
-  CVS_FLAGS := $(CVS_FLAGS) -q -z 3 
-else
-  CVS_FLAGS := $(MOZ_CVS_FLAGS)
-endif
-
-ifdef MOZ_OBJDIR
-  OBJDIR := $(MOZ_OBJDIR)
-  MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
-else
-  OBJDIR := $(TOPSRCDIR)
-  MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS)
-endif
-
-####################################
-# CVS defines for NSS
-#
-NSS_CO_MODULE =               \
-		mozilla/security/nss      \
-		mozilla/security/coreconf \
-		$(NULL)
-
-NSS_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  NSS_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-NSS_CO_FLAGS := $(NSS_CO_FLAGS) $(if $(NSS_CO_TAG),-r $(NSS_CO_TAG),-A)
-
-# Cannot pull static tags by date
-ifeq ($(NSS_CO_TAG),NSS_CLIENT_TAG)
-CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(NSS_CO_MODULE)
-else
-CVSCO_NSS = $(CVS) $(CVS_FLAGS) co $(NSS_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSS_CO_MODULE)
-endif
-
-####################################
-# CVS defines for NSPR
-#
-NSPR_CO_MODULE = mozilla/nsprpub
-NSPR_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  NSPR_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-NSPR_CO_FLAGS := $(NSPR_CO_FLAGS) $(if $(NSPR_CO_TAG),-r $(NSPR_CO_TAG),-A)
-
-# Cannot pull static tags by date
-ifeq ($(NSPR_CO_TAG),NSPRPUB_CLIENT_TAG)
-CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(NSPR_CO_MODULE)
-else
-CVSCO_NSPR = $(CVS) $(CVS_FLAGS) co $(NSPR_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(NSPR_CO_MODULE)
-endif
-
-####################################
-# CVS defines for the C LDAP SDK
-#
-LDAPCSDK_CO_MODULE = mozilla/directory/c-sdk
-LDAPCSDK_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  LDAPCSDK_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-LDAPCSDK_CO_FLAGS := $(LDAPCSDK_CO_FLAGS) $(if $(LDAPCSDK_CO_TAG),-r $(LDAPCSDK_CO_TAG),-A)
-CVSCO_LDAPCSDK = $(CVS) $(CVS_FLAGS) co $(LDAPCSDK_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(LDAPCSDK_CO_MODULE)
-
-####################################
-# CVS defines for standalone modules
-#
-ifeq ($(BUILD_MODULES),all)
-  CHECKOUT_STANDALONE := true
-  CHECKOUT_STANDALONE_NOSUBDIRS := true
-else
-  STANDALONE_CO_MODULE := $(filter-out $(NSPRPUB_DIR) security directory/c-sdk, $(BUILD_MODULE_CVS))
-  STANDALONE_CO_MODULE += allmakefiles.sh client.mk aclocal.m4 configure configure.in
-  STANDALONE_CO_MODULE += Makefile.in
-
-	MOZ_MODULE_LIST += $(addprefix mozilla/,$(STANDALONE_CO_MODULE))
-  NOSUBDIRS_MODULE := $(addprefix mozilla/,$(BUILD_MODULE_CVS_NS))
-
-ifeq (,$(filter $(NSPRPUB_DIR), $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
-  CVSCO_NSPR :=
-endif
-ifeq (,$(filter security security/manager, $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
-  CVSCO_NSS :=
-endif
-ifeq (,$(filter directory/c-sdk, $(BUILD_MODULE_CVS))$(MOZ_CO_PROJECT))
-  CVSCO_LDAPCSDK :=
-endif
-endif
-
-####################################
-# Error on obsolete variables.
-#
-
-ifdef MOZ_MAPINFO
-$(warning MOZ_MAPINFO is obsolete, use MOZ_CO_MODULE=mozilla/tools/codesighs instead.)
-MOZ_MODULE_LIST += mozilla/tools/codesighs
-endif
-ifdef MOZ_INTERNAL_LIBART_LGPL
-$(error MOZ_INTERNAL_LIBART_LGPL is obsolete, use MOZ_CO_MODULE=mozilla/other-licenses/libart_lgpl instead.)
-endif
-ifdef MOZ_PHOENIX
-$(warning MOZ_PHOENIX is obsolete.)
-MOZ_MODULE_LIST += $(MODULES_browser)
-# $(error MOZ_PHOENIX is obsolete, use MOZ_CO_PROJECT=browser and --enable-application=browser)
-endif
-ifdef MOZ_THUNDERBIRD
-$(warning MOZ_THUNDERBIRD is obsolete.)
-MOZ_MODULE_LIST += $(MODULES_mail)
-# $(error MOZ_THUNDERBIRD is obsolete, use MOZ_CO_PROJECT=mail and --enable-application=mail)
-endif
-
-###################################
-# Checkout main modules
-#
-
-# sort is used to remove duplicates.  SeaMonkeyAll is special-cased to
-# checkout last, because if you check it out first, there is a sticky
-# tag left over from checking out the LDAP SDK, which causes files in
-# the root directory to be missed.
-MOZ_MODULE_LIST := $(sort $(filter-out SeaMonkeyAll,$(MOZ_MODULE_LIST))) $(firstword $(filter SeaMonkeyAll,$(MOZ_MODULE_LIST)))
-
-MODULES_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  MODULES_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-MODULES_CO_FLAGS := $(MODULES_CO_FLAGS) $(if $(MOZ_CO_TAG),-r $(MOZ_CO_TAG),-A)
-
-CVSCO_MODULES_NS = $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) -l $(NOSUBDIRS_MODULE)
-
-ifeq (,$(strip $(MOZ_MODULE_LIST)))
-FASTUPDATE_MODULES = $(error No modules or projects were specified. Use MOZ_CO_PROJECT to specify a project for checkout.)
-CHECKOUT_MODULES   = $(error No modules or projects were specified. Use MOZ_CO_PROJECT to specify a project for checkout.)
-else
-FASTUPDATE_MODULES := fast_update $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(MOZ_MODULE_LIST)
-CHECKOUT_MODULES   := $(foreach module,$(MOZ_MODULE_LIST),cvs_co $(CVS) $(CVS_FLAGS) co $(MODULES_CO_FLAGS) $(CVS_CO_DATE_FLAGS) $(module);)
-endif
-ifeq (,$(NOSUBDIRS_MODULE))
-FASTUPDATE_MODULES_NS := true
-CHECKOUT_MODULES_NS   := true
-else
-FASTUPDATE_MODULES_NS := fast_update $(CVSCO_MODULES_NS)
-CHECKOUT_MODULES_NS   := cvs_co      $(CVSCO_MODULES_NS)
-endif
-
-###################################
-# CVS defines for locales
-#
-
-LOCALES_CO_FLAGS := -P
-ifdef MOZ_CO_FLAGS
-  LOCALES_CO_FLAGS := $(MOZ_CO_FLAGS)
-endif
-LOCALES_CO_FLAGS := $(LOCALES_CO_FLAGS) $(if $(LOCALES_CO_TAG),-r $(LOCALES_CO_TAG),-A)
-
-ifndef MOZ_CO_LOCALES
-FASTUPDATE_LOCALES := true
-CHECKOUT_LOCALES := true
-else
-
-override MOZ_CO_LOCALES := $(subst $(comma), ,$(MOZ_CO_LOCALES))
-
-ifeq (all,$(MOZ_CO_LOCALES))
-MOZCONFIG_MODULES += $(foreach project,$(MOZ_PROJECT_LIST),mozilla/$(project)/locales/all-locales)
-
-LOCALE_CO_DIRS := $(sort $(foreach project,$(MOZ_PROJECT_LIST),$(foreach locale,$(shell cat mozilla/$(project)/locales/all-locales),$(foreach dir,$(LOCALES_$(project)),l10n/$(locale)/$(dir)))))
-else # MOZ_CO_LOCALES != all
-LOCALE_CO_DIRS = $(sort $(foreach locale,$(MOZ_CO_LOCALES),$(foreach dir,$(LOCALE_DIRS),l10n/$(locale)/$(dir))))
-endif
-
-CVSCO_LOCALES := $(CVS) $(CVS_FLAGS) -d $(LOCALES_CVSROOT) co $(LOCALES_CO_FLAGS) $(LOCALE_CO_DIRS)
-
-FASTUPDATE_LOCALES := fast_update $(CVSCO_LOCALES)
-CHECKOUT_LOCALES := cvs_co $(CVSCO_LOCALES)
-endif #MOZ_CO_LOCALES
-
-#######################################################################
-# Rules
-# 
-
-# Print out any options loaded from mozconfig.
-all build checkout clean depend distclean export libs install realclean::
-	@if test -f .mozconfig.out; then \
-	  cat .mozconfig.out; \
-	  rm -f .mozconfig.out; \
-	else true; \
-	fi
-
-ifdef _IS_FIRST_CHECKOUT
-all:: checkout build
-else
-all:: checkout alldep
-endif
-
-# Windows equivalents
-pull_all: checkout
-build_all: build
-build_all_dep: alldep
-build_all_depend: alldep
-clobber clobber_all: clean
-pull_and_build_all: checkout alldep
-
-# Do everything from scratch
-everything: checkout clean build
-
-####################################
-# CVS checkout
-#
-checkout::
-#	@: Backup the last checkout log.
-	@if test -f $(CVSCO_LOGFILE) ; then \
-	  mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo "Removing local configures" ; \
-	cd $(ROOTDIR) && \
-	$(RM) -f mozilla/configure mozilla/nsprpub/configure \
-		mozilla/directory/c-sdk/configure
-endif
-	@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
-	@echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)'; \
-        cd $(ROOTDIR) && \
-	$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)
-	@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_checkout
-
-#	Start the checkout. Split the output to the tty and a log file.
-
-real_checkout:
-	@set -e; \
-	cvs_co() { set -e; echo "$$@" ; \
-	  "$$@" 2>&1 | tee -a $(CVSCO_LOGFILE); }; \
-	cvs_co $(CVSCO_NSPR); \
-	cvs_co $(CVSCO_NSS); \
-	cvs_co $(CVSCO_LDAPCSDK); \
-	$(CHECKOUT_MODULES) \
-	$(CHECKOUT_MODULES_NS); \
-	$(CHECKOUT_LOCALES);
-	@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
-# update the NSS checkout timestamp
-	@if test `egrep -c '^(U|C) mozilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \
-		touch $(TOPSRCDIR)/security/manager/.nss.checkout; \
-	fi
-#	@: Check the log for conflicts. ;
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during checkout." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo Generating configures using $(AUTOCONF) ; \
-	cd $(TOPSRCDIR) && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
-endif
-
-fast-update:
-#	@: Backup the last checkout log.
-	@if test -f $(CVSCO_LOGFILE) ; then \
-	  mv $(CVSCO_LOGFILE) $(CVSCO_LOGFILE).old; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo "Removing local configures" ; \
-	cd $(ROOTDIR) && \
-	$(RM) -f mozilla/configure mozilla/nsprpub/configure \
-		mozilla/directory/c-sdk/configure
-endif
-	@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
-	@echo '$(CVSCO) mozilla/client.mk $(MOZCONFIG_MODULES)'; \
-        cd $(ROOTDIR) && \
-	$(CVSCO) mozilla/client.mk $(MOZCONFIG_MODULES)
-	@cd $(TOPSRCDIR) && \
-	$(MAKE) -f client.mk real_fast-update
-
-# Start the update. Split the output to the tty and a log file.
-real_fast-update:
-	@set -e; \
-	fast_update() { set -e; config/cvsco-fast-update.pl $$@ 2>&1 | tee -a $(CVSCO_LOGFILE); }; \
-	cvs_co() { set -e; echo "$$@" ; \
-	  "$$@" 2>&1 | tee -a $(CVSCO_LOGFILE); }; \
-	fast_update $(CVSCO_NSPR); \
-	cd $(ROOTDIR); \
-	cvs_co $(CVSCO_NSS); \
-	cd mozilla; \
-	fast_update $(CVSCO_LDAPCSDK); \
-	$(FASTUPDATE_MODULES); \
-	$(FASTUPDATE_MODULES_NS); \
-	$(FASTUPDATE_LOCALES);
-	@echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE)
-# update the NSS checkout timestamp
-	@if test `egrep -c '^(U|C) mozilla/security/(nss|coreconf)' $(CVSCO_LOGFILE) 2>/dev/null` != 0; then \
-		touch $(TOPSRCDIR)/security/manager/.nss.checkout; \
-	fi
-#	@: Check the log for conflicts. ;
-	@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
-	if test "$$conflicts" ; then \
-	  echo "$(MAKE): *** Conflicts during fast-update." ;\
-	  echo "$$conflicts" ;\
-	  echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
-	  false; \
-	else true; \
-	fi
-ifdef RUN_AUTOCONF_LOCALLY
-	@echo Generating configures using $(AUTOCONF) ; \
-	cd $(TOPSRCDIR) && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/nsprpub && $(AUTOCONF) && \
-	cd $(TOPSRCDIR)/directory/c-sdk && $(AUTOCONF)
-endif
-
-####################################
-# Web configure
-
-WEBCONFIG_FILE  := $(HOME)/.mozconfig
-
-MOZCONFIG2CONFIGURATOR := build/autoconf/mozconfig2configurator
-webconfig:
-	@cd $(TOPSRCDIR); \
-	url=`$(MOZCONFIG2CONFIGURATOR) $(TOPSRCDIR)`; \
-	echo Running mozilla with the following url: ;\
-	echo ;\
-	echo $$url ;\
-	mozilla -remote "openURL($$url)" || \
-	netscape -remote "openURL($$url)" || \
-	mozilla $$url || \
-	netscape $$url ;\
-	echo ;\
-	echo   1. Fill out the form on the browser. ;\
-	echo   2. Save the results to $(WEBCONFIG_FILE)
-
-#####################################################
-# First Checkout
-
-ifdef _IS_FIRST_CHECKOUT
-# First time, do build target in a new process to pick up new files.
-build::
-	$(MAKE) -f $(TOPSRCDIR)/client.mk build
-else
-
-#####################################################
-# After First Checkout
-
-
-####################################
-# Configure
-
-CONFIG_STATUS := $(wildcard $(OBJDIR)/config.status)
-CONFIG_CACHE  := $(wildcard $(OBJDIR)/config.cache)
-
-ifdef RUN_AUTOCONF_LOCALLY
-EXTRA_CONFIG_DEPS := \
-	$(TOPSRCDIR)/aclocal.m4 \
-	$(wildcard $(TOPSRCDIR)/build/autoconf/*.m4) \
-	$(NULL)
-
-$(TOPSRCDIR)/configure: $(TOPSRCDIR)/configure.in $(EXTRA_CONFIG_DEPS)
-	@echo Generating $@ using autoconf
-	cd $(TOPSRCDIR); $(AUTOCONF)
-endif
-
-CONFIG_STATUS_DEPS := \
-	$(TOPSRCDIR)/configure \
-	$(TOPSRCDIR)/allmakefiles.sh \
-	$(TOPSRCDIR)/.mozconfig.mk \
-	$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
-	$(wildcard $(TOPSRCDIR)/directory/c-sdk/configure) \
-	$(wildcard $(TOPSRCDIR)/mailnews/makefiles) \
-	$(wildcard $(TOPSRCDIR)/themes/makefiles) \
-	$(wildcard $(TOPSRCDIR)/config/milestone.txt) \
-	$(wildcard $(TOPSRCDIR)/config/chrome-versions.sh) \
-	$(NULL)
-
-# configure uses the program name to determine @srcdir@. Calling it without
-#   $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
-#   path of $(TOPSRCDIR).
-ifeq ($(TOPSRCDIR),$(OBJDIR))
-  CONFIGURE := ./configure
-else
-  CONFIGURE := $(TOPSRCDIR)/configure
-endif
-
-ifdef MOZ_TOOLS
-  CONFIGURE := $(TOPSRCDIR)/configure
-endif
-
-configure:
-	@if test ! -d $(OBJDIR); then $(MKDIR) $(OBJDIR); else true; fi
-	@echo cd $(OBJDIR);
-	@echo $(CONFIGURE) $(CONFIGURE_ARGS)
-	@cd $(OBJDIR) && $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
-	  || ( echo "*** Fix above errors and then restart with\
-               \"$(MAKE) -f client.mk build\"" && exit 1 )
-	@touch $(OBJDIR)/Makefile
-
-$(OBJDIR)/Makefile $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
-	@$(MAKE) -f $(TOPSRCDIR)/client.mk configure
-
-ifdef CONFIG_STATUS
-$(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
-	cd $(OBJDIR); \
-	  CONFIG_FILES=config/autoconf.mk ./config.status
-endif
-
-
-####################################
-# Depend
-
-depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) export && $(MOZ_MAKE) depend
-
-####################################
-# Build it
-
-build::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE)
-
-####################################
-# Profile-feedback build (gcc only)
-#  To use this, you should set the following variables in your mozconfig
-#    mk_add_options PROFILE_GEN_SCRIPT=/path/to/profile-script
-#
-#  The profile script should exercise the functionality to be included
-#  in the profile feedback.
-
-profiledbuild:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) MOZ_PROFILE_GENERATE=1
-	OBJDIR=${OBJDIR} $(PROFILE_GEN_SCRIPT)
-	$(MOZ_MAKE) clobber_all
-	$(MOZ_MAKE) MOZ_PROFILE_USE=1
-	find $(OBJDIR) -name "*.da" -exec rm {} \;
-
-####################################
-# Other targets
-
-# Pass these target onto the real build system
-install export libs clean realclean distclean alldep:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	$(MOZ_MAKE) $@
-
-cleansrcdir:
-	@cd $(TOPSRCDIR); \
-        if [ -f webshell/embed/gtk/Makefile ]; then \
-          $(MAKE) -C webshell/embed/gtk distclean; \
-        fi; \
-	if [ -f Makefile ]; then \
-	  $(MAKE) distclean ; \
-	else \
-	  echo "Removing object files from srcdir..."; \
-	  rm -fr `find . -type d \( -name .deps -print -o -name CVS \
-	          -o -exec test ! -d {}/CVS \; \) -prune \
-	          -o \( -name '*.[ao]' -o -name '*.so' \) -type f -print`; \
-	   build/autoconf/clean-config.sh; \
-	fi;
-
-# (! IS_FIRST_CHECKOUT)
-endif
-
-echo_objdir:
-	@echo $(OBJDIR)
-
-.PHONY: checkout real_checkout depend build export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure

mozilla/xpfe/components/urlbarhistory/Makefile.in

@@ -0,0 +1,31 @@
+#
+# 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 Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):  
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpfe/components/urlbarhistory/makefile.win

@@ -0,0 +1,26 @@
+#!nmake
+#
+# 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 Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+
+DIRS=public src
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/urlbarhistory/public/MANIFEST_IDL

@@ -0,0 +1 @@
+nsIUrlbarHistory.idl

mozilla/xpfe/components/urlbarhistory/public/Makefile.in

@@ -0,0 +1,35 @@
+#
+# 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 Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+XPIDL_MODULE	= urlbarhistory
+
+XPIDLSRCS	= nsIUrlbarHistory.idl        \
+                  $(NULL)
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpfe/components/urlbarhistory/public/makefile.win

@@ -0,0 +1,30 @@
+#!nmake
+#
+# 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 Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..
+
+MODULE=urlbarhistory
+
+XPIDLSRCS =                   \
+    .\nsIUrlbarHistory.idl          \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/urlbarhistory/public/nsIUrlbarHistory.idl

@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): Radha Kulkarni (radha@netscape.com)
+ *                 Jason Eager    (jce2@po.cwru.edu)
+ */
+ 
+#include "nsISupports.idl"
+#include "nsIFactory.idl"
+
+
+%{C++
+#define NS_URLBARHISTORY_CID \
+{0x74254499, 0x171a, 0x11d4, {0x98, 0x70, 0x0, 0xc0, 0x4f, 0xa0, 0x2f, 0x40}}
+
+
+#define NS_URLBARHISTORY_CONTRACTID "@mozilla.org/browser/urlbarhistory;1"
+#define NS_URLBARAUTOCOMPLETE_CONTRACTID "@mozilla.org/autocompleteSession;1?type=urlbar"
+#define UBHISTORY_MAX_ENTRIES = 15;
+%}
+
+[scriptable, uuid(74254499-171a-11d4-9870-00c04fa02f40)]
+interface nsIUrlbarHistory: nsISupports
+{
+  /**
+   * Get the size of the History list
+   */
+   readonly attribute long count;
+
+  /**
+   * clear the History contents
+   */
+   void clearHistory();
+    
+
+};

mozilla/xpfe/components/urlbarhistory/src/Makefile.in

@@ -0,0 +1,40 @@
+#
+# 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 Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+LIBRARY_NAME	= urlbarhistory_s
+REQUIRES	= xpcom string rdf pref js necko
+
+CPPSRCS		= nsUrlbarHistory.cpp
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpfe/components/urlbarhistory/src/makefile.win

@@ -0,0 +1,40 @@
+#!nmake
+#
+# 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 Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..
+MODULE=appcomps
+LIBRARY_NAME=urlbarhistory_s
+
+CPP_OBJS=                               \
+ .\$(OBJDIR)\nsUrlbarHistory.obj        \
+ $(NULL)
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpfe/components/urlbarhistory/src/nsUBHistoryModule.cpp

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):  Radha Kulkarni radha@netscape.com
+ */
+
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIUrlbarHistory.h"
+
+#include "nsUrlbarHistory.h"
+
+// Factory Constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory)
+
+///////////////////////////////////////////////////////////////////////////////
+// Module implementation for the history library
+
+static nsModuleComponentInfo gUBHistoryModuleInfo[] = 
+{
+   { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
+      NS_URLBARHISTORY_CONTRACTID, nsUrlbarHistoryConstructor },
+   { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
+      NS_URLBARAUTOCOMPLETE_CONTRACTID, nsUrlbarHistoryConstructor }
+};
+
+NS_IMPL_NSGETMODULE("Urlbar History Module", gUBHistoryModuleInfo)

mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp

@@ -0,0 +1,677 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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 the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Radha Kulkarni <radha@netscape.com>
+ * 
+ */
+
+// Local Includes 
+#include "nsUrlbarHistory.h"
+
+// Helper Classes
+#include "nsXPIDLString.h"
+
+// Interfaces Needed
+#include "nsString.h"
+#include "nsIAutoCompleteResults.h"
+#include "nsISimpleEnumerator.h"
+#include "nsIPref.h"
+#include "nsIServiceManager.h"
+#include "nsIRDFService.h"
+#include "nsIRDFContainer.h"
+#include "nsIRDFContainerUtils.h"
+#include "nsIURL.h"
+
+
+static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+static NS_DEFINE_CID(kRDFCUtilsCID, NS_RDFCONTAINERUTILS_CID);
+static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
+
+static char * ignoreArray[] = {
+		"http://",
+	    "ftp://",
+		"www.",
+		"http://www.",
+		"https://",
+		"https://www.",
+		"keyword:",
+		"://",
+		"//",
+		"\\",
+		":\\",
+		"file:///",
+		".com",
+		".org",
+		".net",
+		".",
+		"?",
+		"&",
+		"="
+	};
+static nsIRDFResource * kNC_CHILD;
+static nsIRDFResource * kNC_URLBARHISTORY;
+static nsIRDFService * gRDFService;
+static nsIRDFContainerUtils * gRDFCUtils;
+
+#define PREF_AUTOCOMPLETE_ENABLED "browser.urlbar.autocomplete.enabled"
+
+
+
+//*****************************************************************************
+//***    nsUrlbarHistory: Object Management
+//*****************************************************************************
+
+nsUrlbarHistory::nsUrlbarHistory()
+{
+   NS_INIT_REFCNT();
+   PRInt32 cnt = sizeof(ignoreArray)/sizeof(char *);
+   for(PRInt32 i=0; i< cnt; i++) 
+     mIgnoreArray.AppendString(NS_ConvertASCIItoUCS2(ignoreArray[i]));
+   
+   nsresult res;
+
+   res = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService),
+                                      (nsISupports **)&gRDFService);
+   res = nsServiceManager::GetService(kRDFCUtilsCID, NS_GET_IID(nsIRDFContainerUtils),
+                                      (nsISupports **)&gRDFCUtils);
+   if (gRDFService) {
+	   //printf("$$$$ Got RDF SERVICE $$$$\n");
+     res = gRDFService->GetDataSource("rdf:localstore", getter_AddRefs(mDataSource));
+
+	 res = gRDFService->GetResource("http://home.netscape.com/NC-rdf#child", &kNC_CHILD);
+	 res = gRDFService->GetResource("nc:urlbar-history", &kNC_URLBARHISTORY);
+   }
+   
+   nsCOMPtr<nsIPref> prefs = do_GetService(kPrefServiceCID, &res);
+   if (NS_SUCCEEDED(res)) {
+       prefs->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mEnabled);
+       prefs->AddObserver(PREF_AUTOCOMPLETE_ENABLED, this);
+   }
+   
+}
+
+
+nsUrlbarHistory::~nsUrlbarHistory()
+{
+	//Entries are now in RDF
+    //ClearHistory();
+    
+	mDataSource = nsnull;
+    
+    NS_IF_RELEASE(gRDFService);
+    NS_IF_RELEASE(gRDFCUtils);
+	NS_IF_RELEASE(kNC_URLBARHISTORY);
+	NS_IF_RELEASE(kNC_CHILD);
+
+}
+
+//*****************************************************************************
+//    nsUrlbarHistory: nsISupports
+//*****************************************************************************
+
+NS_IMPL_ADDREF(nsUrlbarHistory)
+NS_IMPL_RELEASE(nsUrlbarHistory)
+
+NS_INTERFACE_MAP_BEGIN(nsUrlbarHistory)
+   NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteSession)
+   NS_INTERFACE_MAP_ENTRY(nsIUrlbarHistory)
+   NS_INTERFACE_MAP_ENTRY(nsIObserver)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIUrlbarHistory)
+NS_INTERFACE_MAP_END
+
+//*****************************************************************************
+//    nsUrlbarHistory: nsISHistory
+//*****************************************************************************
+	NS_IMETHODIMP
+nsUrlbarHistory::ClearHistory()
+{
+  /* Get the elements in the data source through the container
+   */
+  nsCOMPtr<nsIRDFContainer> container;
+  gRDFCUtils->MakeSeq(mDataSource,
+                      kNC_URLBARHISTORY,
+                      getter_AddRefs(container));
+ 
+  NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+
+  /* Remove all the elements, back to front, to avoid O(n^2) updates
+   * from RDF.
+   */
+  PRInt32 count = 0;
+  container->GetCount(&count);
+  for (PRInt32 i = count; i >= 1; --i) {
+    nsCOMPtr<nsIRDFNode> dummy;
+    container->RemoveElementAt(i, PR_TRUE, getter_AddRefs(dummy));
+  }
+
+#ifdef DEBUG
+  container->GetCount(&count);
+  NS_ASSERTION(count == 0, "count != 0 after clearing history");
+#endif
+
+  return NS_OK;
+}
+
+
+/* Get size of the history list */
+NS_IMETHODIMP
+nsUrlbarHistory::GetCount(PRInt32 * aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  nsCOMPtr<nsIRDFContainer> container;
+  gRDFCUtils->MakeSeq(mDataSource, 
+                      kNC_URLBARHISTORY,
+                      getter_AddRefs(container));
+
+  NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+  return container->GetCount(aResult);
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnStartLookup(const PRUnichar *uSearchString,
+                               nsIAutoCompleteResults *previousSearchResult,
+                               nsIAutoCompleteListener *listener)
+{
+    nsresult rv = NS_OK;
+ 
+    if (!listener)
+        return NS_ERROR_NULL_POINTER;
+      
+	if (!mEnabled) {// urlbar autocomplete is not enabled
+		listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+		return NS_OK;
+	}
+ //   printf("Autocomplete is enabled\n");   
+
+    if (uSearchString[0] == 0)
+    {
+        listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+        return NS_OK;
+    }
+ 
+    // Check if it is one of the generic strings "http://, www., ftp:// etc..
+    PRInt32 cnt = mIgnoreArray.Count();
+	for(PRInt32 i=0; i<cnt; i++) {
+       nsString * match = mIgnoreArray.StringAt(i);
+	   
+	   if (match) {
+          PRInt32 index = match->Find(uSearchString, PR_TRUE);
+		  if (index == 0) {
+			  listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+		      return NS_OK;
+		  }
+	   }  // match
+	}  //for
+    
+    nsCOMPtr<nsIAutoCompleteResults> results;
+	/* Don't call SearchPreviousResults. It is buggy 
+    if (NS_FAILED(SearchPreviousResults(uSearchString, previousSearchResult)))
+    {
+        results = do_CreateInstance(NS_AUTOCOMPLETERESULTS_CONTRACTID);
+		NS_ENSURE_TRUE(results, NS_ERROR_FAILURE);
+        rv = SearchCache(uSearchString, results);       
+    }
+    else
+        results = previousSearchResult;
+      */
+	
+	results = do_CreateInstance(NS_AUTOCOMPLETERESULTS_CONTRACTID);
+	NS_ENSURE_TRUE(results, NS_ERROR_FAILURE);
+    rv = SearchCache(nsLiteralString(uSearchString), results);    
+
+    AutoCompleteStatus status = nsIAutoCompleteStatus::failed;
+    if (NS_FAILED(rv)) return NS_OK;
+    
+    PRBool addedDefaultItem = PR_FALSE;
+
+    results->SetSearchString(uSearchString);
+    results->SetDefaultItemIndex(-1);
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = results->GetItems(getter_AddRefs(array));
+
+    if (NS_FAILED(rv)) return NS_OK;
+    
+    PRUint32 nbrOfItems;
+    rv = array->Count(&nbrOfItems);
+
+    if (NS_SUCCEEDED(rv)) {
+        if (nbrOfItems > 1) {
+            results->SetDefaultItemIndex(addedDefaultItem ? 1 : 0);
+            status = nsIAutoCompleteStatus::matchFound;
+        }
+        else {
+            if (nbrOfItems == 1) {
+                results->SetDefaultItemIndex(0);
+                status = nsIAutoCompleteStatus::matchFound;
+            }
+            else
+                status = nsIAutoCompleteStatus::noMatch;
+        }
+    }  // NS_SUCCEEDED(rv)
+
+    listener->OnAutoComplete(results, status);
+    
+    return NS_OK;
+}
+
+#if 0
+NS_IMETHODIMP
+nsUrlbarHistory::SearchPreviousResults(const PRUnichar *searchStr,
+                                       nsIAutoCompleteResults *previousSearchResult)
+{
+    if (!previousSearchResult)
+        return NS_ERROR_NULL_POINTER;
+        
+    nsXPIDLString prevSearchString;
+    PRUint32 searchStrLen = nsCRT::strlen(searchStr);
+    nsresult rv;
+
+    rv = previousSearchResult->GetSearchString(getter_Copies(prevSearchString));
+    if (NS_FAILED(rv))
+        return NS_ERROR_FAILURE;
+    
+    if (!(const PRUnichar*)prevSearchString)
+        return NS_ERROR_FAILURE;
+    
+    PRUint32 prevSearchStrLen = nsCRT::strlen(prevSearchString);
+    if (searchStrLen < prevSearchStrLen || nsCRT::strncasecmp(searchStr, prevSearchString, prevSearchStrLen != 0))
+        return NS_ERROR_ABORT;
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = previousSearchResult->GetItems(getter_AddRefs(array));
+
+    if (NS_FAILED(rv)) return rv;
+    
+    PRUint32 nbrOfItems;
+    PRUint32 i;
+        
+    rv = array->Count(&nbrOfItems);
+    if (NS_FAILED(rv) || nbrOfItems <= 0)
+        return NS_ERROR_FAILURE;
+        
+    nsCOMPtr<nsISupports> item;
+    nsCOMPtr<nsIAutoCompleteItem> resultItem;
+        
+    // XXX I don't understand the purpose of this loop!
+    for (i = 0; i < nbrOfItems; i ++) {
+        rv = array->QueryElementAt(i, NS_GET_IID(nsIAutoCompleteItem),
+                                   getter_AddRefs(resultItem));
+        if (NS_FAILED(rv))
+            return NS_ERROR_FAILURE;
+
+        nsXPIDLString itemValue;
+        resultItem->GetValue(getter_Copies(itemValue));
+
+        // nsCAutoString itemAutoStr;
+        // itemAutoStr.AssignWithConversion(itemValue);
+        // printf("SearchPreviousResults::Comparing %s with %s \n", searchAutoStr.ToNewCString(), itemAutoStr.get());
+        if (!(const PRUnichar*)itemValue)
+            continue;
+            
+        if (nsCRT::strncasecmp(searchStr, itemValue, searchStrLen) == 0)
+            continue;
+			
+    }
+    
+    return NS_OK;
+}
+#endif
+
+NS_IMETHODIMP
+nsUrlbarHistory::SearchCache(nsAReadableString& searchStr,
+                             nsIAutoCompleteResults* results)
+{
+    nsresult rv = NS_OK;
+	nsCOMPtr<nsISimpleEnumerator>  entries;
+
+    //printf("******** In SearchCache *******\n");
+	
+	PRInt32  protocolIndex=-1;
+    nsAutoString searchProtocol, searchPath;
+    PRInt32 searchPathIndex, searchStrLength;
+
+    // Get the length of the search string
+    searchStrLength = searchStr.Length();
+    // Check if there is any protocol present in the 
+    // search string.
+    GetHostIndex(searchStr, &searchPathIndex);
+    if (searchPathIndex > 0) {
+        // There was a protocol in the search string. Strip off
+        // the protocol from the rest of the url  
+        searchStr.Left(searchProtocol, searchPathIndex);
+        searchStr.Mid(searchPath, searchPathIndex, searchStrLength);
+    }
+    else {
+        // There was no protocol in the search string. 
+        searchPath = searchStr;
+    }
+	//printf("Search String is %s path = %s protocol = %s \n", searchStr.ToNewCString(), searchPath.ToNewCString(), searchProtocol.ToNewCString());
+	   
+	if (!gRDFCUtils || !kNC_URLBARHISTORY)
+        return NS_ERROR_FAILURE;
+
+
+	nsCOMPtr<nsIRDFContainer> container;
+    /* Get the elements in the  data source
+     * through the container
+     */
+	rv = gRDFCUtils->MakeSeq(mDataSource,
+                            kNC_URLBARHISTORY,
+                            getter_AddRefs(container));
+
+    NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+ 
+    //Get the elements from the container
+    container->GetElements(getter_AddRefs(entries));
+
+    NS_ENSURE_TRUE(entries, NS_ERROR_FAILURE);
+    
+    PRBool moreElements = PR_FALSE;
+    while (NS_SUCCEEDED(entries->HasMoreElements(&moreElements)) && moreElements) {
+       nsCOMPtr<nsISupports>  entry;
+       nsCOMPtr<nsIRDFLiteral>  literal;
+       nsAutoString rdfProtocol, rdfPath;
+       PRInt32 rdfPathIndex, index = -1;
+       nsAutoString match;
+       const PRUnichar * rdfValue = nsnull;   
+
+       rv = entries->GetNext(getter_AddRefs(entry));
+       if (entry) {
+         literal = do_QueryInterface(entry);
+         literal->GetValueConst(&rdfValue);
+       }      
+       if (!rdfValue)
+          continue;
+       nsLiteralString valueStr(rdfValue);
+
+       // Get the index of the hostname in the rdf string
+       GetHostIndex (valueStr, &rdfPathIndex);
+
+       if (rdfPathIndex > 0) {
+          // RDf string has a protocol in it, Strip it off
+          // from the rest of the url;
+          valueStr.Left(rdfProtocol, rdfPathIndex);
+          valueStr.Mid(rdfPath, rdfPathIndex, valueStr.Length());
+       }
+       else {
+          // There was no protocol.
+          rdfPath = valueStr;
+       }
+       //printf("RDFString is %s path = %s protocol = %s\n", valueStr.ToNewCString(), rdfPath.ToNewCString(), rdfProtocol.ToNewCString());
+       // We have all the data we need. Let's do the comparison
+       // We compare the path first and compare the protocol next
+       index = rdfPath.Find(searchPath, PR_TRUE);       
+       if (index == 0) {
+           // The paths match. Now let's compare protocols
+           if (searchProtocol.Length() && rdfProtocol.Length()) {
+              // Both the strings have a protocol part. Compare them.
+              protocolIndex = rdfProtocol.Find(searchProtocol);
+              if (protocolIndex == 0) {
+                  // Both protocols match. We found a result item
+                  match = valueStr;
+              } 
+           } 
+           else if (searchProtocol.Length() && (rdfProtocol.Length() <= 0)) {
+               /* The searchString has a protocol but the rdf string doesn't
+                * Check if the searchprotocol is the default "http://". If so,
+                * prepend the searchProtocol to the rdfPath and provide that as 
+                * the result. Otherwise we don't have a match
+                */
+               // XXX I guess  hard-coded "http://" is OK, since netlib considers
+               // all urls to be char *
+               if ((searchProtocol.Find("http://", PR_TRUE)) == 0) {
+                  match = searchProtocol + rdfPath;
+               }
+           }
+           else if ((searchProtocol.Length() <=0) && rdfProtocol.Length() ||
+                    (searchProtocol.Length() <=0) && (rdfProtocol.Length() <= 0)) {
+               /* Provide the rdfPath (no protocol, just the www.xyz.com/... part) 
+                * as the result for the following 2 cases.
+                * a) searchString has no protocol but rdfString has protocol
+                * b) Both searchString and rdfString don't have a protocol
+                */ 
+               match = rdfPath;
+           }           
+       }  // (index == 0)
+
+      
+	   
+       if (!match.IsEmpty()) {		   
+           /* We have a result item.
+            * First make sure that the value is not already
+            * present in the results array. If we have  
+            * www.mozilla.org and http://www.mozilla.org as unique addresses
+            * in the history and due to the algorithm we follow above to find a match,
+            * when the user user types, http://www.m, we would have 2 matches, both being,
+            * http://www.mozilla.org. So, before adding an entry as a result,
+            * make sure it is not already present in the resultarray
+            */
+           PRBool itemPresent = PR_FALSE;
+           rv = CheckItemAvailability(match, results, &itemPresent);
+           if (itemPresent) {
+               continue;
+           }
+           //Create an AutoComplete Item 
+		   nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
+		   NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);
+           
+           newItem->SetValue(match.get());
+           nsCOMPtr<nsISupportsArray> array;
+           rv = results->GetItems(getter_AddRefs(array));
+           if (NS_SUCCEEDED(rv))
+		   { 
+			  // printf("Appending element %s to the results array\n", item->ToNewCString());
+                array->AppendElement((nsISupports*)newItem);
+		   }	
+           /* The result may be much more than what was asked for. For example
+            * the user types http://www.moz and we had http://www.mozilla.org/sidebar
+            * as an entry in the history. This will match our selection criteria above
+            * above and will be provided as result. But the user may actually want to 
+            * go to http://www.mozilla.org. If we are such a situation, offer
+            * http://www.mozilla.org (The first part of the result string http://www.mozilla.org/sidebar)
+            * as a result option(probably the default result).
+            */
+            rv = VerifyAndCreateEntry(searchStr, match, results);
+	   }   
+
+    }    // while 
+    return rv;
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::GetHostIndex(nsAReadableString& aPath, PRInt32 * aReturn)
+{
+    if (!aReturn)
+        return NS_ERROR_FAILURE;
+
+    PRInt32 slashIndex=-1;    
+    nsresult rv;
+    
+    nsCOMPtr<nsIURL> pathURL=do_CreateInstance(kStandardURLCID, &rv);
+    if (pathURL) {
+       pathURL->SetSpec(NS_ConvertUCS2toUTF8(aPath).get());
+       nsXPIDLCString host, preHost, filePath;
+
+       pathURL->GetHost(getter_Copies(host));
+       pathURL->GetFilePath(getter_Copies(filePath));
+       pathURL->GetPreHost(getter_Copies(preHost));
+       
+       nsAutoString path(aPath);
+       if ((const char*)preHost) 
+           slashIndex  = path.Find(preHost, PR_TRUE);
+       else if ((const char *)host)
+           slashIndex = path.Find(host,PR_TRUE);
+       else if ((const char *)filePath)
+           slashIndex = path.Find(filePath, PR_TRUE);
+       else
+           slashIndex = 0;
+       
+       //printf("$$$$ Scheme for uri = %s, preHost = %s, filepath = %s, Host = %s HostIndex = %d\n", pathScheme, preHost, filePath, pathHost, *aReturn);
+    }
+
+    *aReturn = slashIndex;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::CheckItemAvailability(nsAReadableString& aItem,
+                                       nsIAutoCompleteResults * aArray,
+                                       PRBool * aResult)
+{
+    if (!aArray)
+        return PR_FALSE;
+    
+    nsresult rv;
+    *aResult = PR_FALSE;
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = aArray->GetItems(getter_AddRefs(array));
+
+    // no item array, just return false;
+    if (NS_FAILED(rv)) return NS_OK;
+
+    PRUint32 nbrOfItems=0;
+    PRUint32 i;
+        
+    rv = array->Count(&nbrOfItems);
+    // If there is no item found in the array, return false
+    if (nbrOfItems <= 0)
+        return NS_OK;
+        
+    nsCOMPtr <nsIAutoCompleteItem> resultItem;
+    for (i = 0; i < nbrOfItems; i ++) {
+
+        rv = array->QueryElementAt(i, NS_GET_IID(nsIAutoCompleteItem),
+                                   getter_AddRefs(resultItem));
+        if (NS_FAILED(rv))
+            return NS_ERROR_FAILURE;
+
+        nsXPIDLString itemValue;
+        resultItem->GetValue(getter_Copies(itemValue));
+        // Using nsIURI to do comparisons didn't quite work out.
+        // So use nsCRT methods
+        if (aItem.Equals(itemValue))
+            {
+                //printf("In CheckItemAvailability. Item already found\n");
+                *aResult = PR_TRUE;
+                break;
+            }
+    }  // for
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::VerifyAndCreateEntry(nsAReadableString& aSearchItem,
+                                      nsString& aMatchStr,
+                                      nsIAutoCompleteResults * aResultArray)
+{
+    if (!aResultArray)
+        return NS_ERROR_FAILURE;
+
+    PRInt32 searchStrLen = aSearchItem.Length();
+    nsresult rv;
+    nsCOMPtr<nsIURL>  searchURL = do_CreateInstance(kStandardURLCID, &rv);
+    if (searchURL) {
+        searchURL->SetSpec(NS_ConvertUCS2toUTF8(aSearchItem).get());
+        nsXPIDLCString filePath;
+        searchURL->GetFilePath(getter_Copies(filePath));
+        // Don't bother checking for hostname if the search string
+        // already has a filepath;
+        if (filePath && (nsCRT::strlen(filePath) > 1)) {
+            return NS_OK;
+        }
+    }
+          
+    nsCOMPtr<nsIURL> matchURL = do_CreateInstance(kStandardURLCID, &rv);
+    if (matchURL) {
+        matchURL->SetSpec(NS_ConvertUCS2toUTF8(aMatchStr).get());
+        nsXPIDLCString filePath;
+        matchURL->GetFilePath(getter_Copies(filePath));
+        // If the match string doesn't have a filepath
+        // we need to do nothing here,  return.
+        if (!filePath || (filePath && (nsCRT::strlen(filePath) <=1)))
+            return NS_OK;
+        
+        // Find the position of the filepath in the result string
+        PRInt32 slashIndex = aMatchStr.Find("/", PR_FALSE, searchStrLen);
+        // Extract the host name
+        nsAutoString hostName;
+        aMatchStr.Left(hostName, slashIndex);
+        //printf("#### Host Name is %s\n", hostName.ToNewCString());
+        // Check if this host is already present in the result array
+        // If not add it to the result array
+        PRBool itemAvailable = PR_TRUE;
+        CheckItemAvailability(hostName, aResultArray, &itemAvailable);
+        if (!itemAvailable) {
+            // Insert the host name to the result array at the top
+            //Create an AutoComplete Item 
+		    nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
+            NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);            
+            newItem->SetValue(hostName.GetUnicode());
+            nsCOMPtr<nsISupportsArray> array;
+            rv = aResultArray->GetItems(getter_AddRefs(array));
+            // Always insert the host entry at the top of the array
+            if (NS_SUCCEEDED(rv)) {
+                array->InsertElementAt(newItem, 0);
+            }
+        }       
+    }
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnStopLookup()
+{
+    printf("nsUrlbarHistory::OnStopLookup()\n");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnAutoComplete(const PRUnichar *searchString,
+                                nsIAutoCompleteResults *previousSearchResult,
+                                nsIAutoCompleteListener *listener)
+{
+#if 1
+    printf("nsUrlbarHistory::OnAutoComplete(%s)\n", NS_ConvertUCS2toUTF8(searchString));
+#endif
+	return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::Observe(nsISupports *aSubject, const PRUnichar *aTopic,
+                         const PRUnichar *aSomeData)
+{
+    nsresult rv;
+    
+    if (nsCRT::strcmp(aTopic, NS_LITERAL_STRING("nsPref:changed").get())==0) {
+        
+        nsCOMPtr<nsIPref> prefs=do_QueryInterface(aSubject, &rv);
+        if (NS_SUCCEEDED(rv))
+            prefs->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mEnabled);
+
+    }
+    return NS_OK;
+}

mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.h

@@ -0,0 +1,68 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Radha Kulkarni <radha@netscape.com>
+ */
+
+#ifndef nsUrlbarHistory_h
+#define nsUrlbarHistory_h
+
+// Helper Classes
+#include "nsCOMPtr.h"
+
+//Interfaces Needed
+#include "nsIUrlbarHistory.h"
+#include "nsIAutoCompleteSession.h"
+#include "nsIObserver.h"
+#include "nsVoidArray.h"
+#include "nsIRDFService.h"
+#include "nsIRDFDataSource.h"
+#include "nsRDFCID.h"
+
+class nsUrlbarHistory: public nsIUrlbarHistory,
+                       public nsIObserver,
+                       public nsIAutoCompleteSession
+{
+public:
+	nsUrlbarHistory();
+
+	NS_DECL_ISUPPORTS
+	NS_DECL_NSIURLBARHISTORY
+    NS_DECL_NSIOBSERVER
+	NS_DECL_NSIAUTOCOMPLETESESSION
+
+protected:
+   virtual ~nsUrlbarHistory();
+
+#if 0
+   NS_IMETHOD SearchPreviousResults(const PRUnichar *, nsIAutoCompleteResults *);
+#endif
+   NS_IMETHOD SearchCache(nsAReadableString&, nsIAutoCompleteResults *);
+   NS_IMETHOD GetHostIndex(nsAReadableString& aPath, PRInt32 * aReturn);
+   NS_IMETHOD CheckItemAvailability(nsAReadableString& aItem, nsIAutoCompleteResults * aArray, PRBool * aResult);
+   NS_IMETHOD VerifyAndCreateEntry(nsAReadableString& aItem, nsString& aMatchItem, nsIAutoCompleteResults * aArray);
+
+private:
+	nsStringArray  mIgnoreArray;
+	nsCOMPtr<nsIRDFDataSource> mDataSource;
+    PRBool mEnabled;
+};
+
+
+#endif   /* nsUrlbarHistory */