From ba6e05d3c1c643000e66e428a046210d24801232 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mar.castelluccio@studenti.unina.it>
Date: Wed, 9 May 2012 21:30:41 +0200
Subject: [PATCH] Bug 615213 - Remove nsIGlobalHistory. r=bsmedberg

---
 docshell/base/Makefile.in                     |  1 -
 docshell/base/nsDownloadHistory.cpp           |  1 -
 docshell/base/nsIGlobalHistory.idl            | 75 -------------------
 embedding/browser/webBrowser/nsWebBrowser.cpp |  1 -
 toolkit/components/places/nsNavHistory.h      |  1 -
 5 files changed, 79 deletions(-)
 delete mode 100644 docshell/base/nsIGlobalHistory.idl

diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
index 5bac6617e1a..3a30c8d8c8d 100644
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -53,7 +53,6 @@ DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
 SDK_XPIDLSRCS = \
-  nsIGlobalHistory.idl \
   nsIClipboardCommands.idl \
   $(NULL)
 
diff --git a/docshell/base/nsDownloadHistory.cpp b/docshell/base/nsDownloadHistory.cpp
index 84700cf5ded..48a947c2b94 100644
--- a/docshell/base/nsDownloadHistory.cpp
+++ b/docshell/base/nsDownloadHistory.cpp
@@ -40,7 +40,6 @@
 #include "nsDownloadHistory.h"
 #include "nsCOMPtr.h"
 #include "nsServiceManagerUtils.h"
-#include "nsIGlobalHistory.h"
 #include "nsIGlobalHistory2.h"
 #include "nsIObserverService.h"
 #include "nsIURI.h"
diff --git a/docshell/base/nsIGlobalHistory.idl b/docshell/base/nsIGlobalHistory.idl
deleted file mode 100644
index e0df1be2bd0..00000000000
--- a/docshell/base/nsIGlobalHistory.idl
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of 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 ***** */
-
-/**
- *
- * The interface to global history.
- *
- * @status DEPRECATED. This interface is still accepted, but new
- *         implementations should use nsIGlobalHistory2.
- * @version 1.0
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(9491C383-E3C4-11d2-BDBE-0050040A9B44)]
-interface nsIGlobalHistory : nsISupports
-{
-    /**
-     * addPage
-     * Add a page to the history
-     *
-     * @param aURL the url to the page
-     */
-
-    void addPage(in string aURL);
-
-    /**
-     * isVisited
-     * Checks to see if the given page is in history
-     *
-     * @return true if a page has been passed into addPage().
-     * @param aURL the url to the page
-     */
-    boolean isVisited(in string aURL);
-};
-
-%{ C++
-#define NS_GLOBALHISTORY_CONTRACTID \
-    "@mozilla.org/browser/global-history;1"
-%}
-
diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp
index 87c4f3354ed..65410754109 100644
--- a/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/embedding/browser/webBrowser/nsWebBrowser.cpp
@@ -60,7 +60,6 @@
 #include "nsIWebBrowserFocus.h"
 #include "nsIWebBrowserStream.h"
 #include "nsIPresShell.h"
-#include "nsIGlobalHistory.h"
 #include "nsIDocShellHistory.h"
 #include "nsIURIContentListener.h"
 #include "nsGUIEvent.h"
diff --git a/toolkit/components/places/nsNavHistory.h b/toolkit/components/places/nsNavHistory.h
index d82ce2998c5..f83cd2fb05b 100644
--- a/toolkit/components/places/nsNavHistory.h
+++ b/toolkit/components/places/nsNavHistory.h
@@ -46,7 +46,6 @@
 #include "nsPIPlacesDatabase.h"
 #include "nsPIPlacesHistoryListenersNotifier.h"
 #include "nsIBrowserHistory.h"
-#include "nsIGlobalHistory.h"
 #include "nsINavBookmarksService.h"
 #include "nsIPrivateBrowsingService.h"
 #include "nsIFaviconService.h"