зеркало из https://github.com/mozilla/gecko-dev.git
Bug 398811 - "Remove MOZILLA_1_8_BRANCH ifdefs from toolkit on trunk" [p=mh+mozilla@glandium.org (Mike Hommey) r=gavin a1.9=damons]
This commit is contained in:
Родитель
c230b0939e
Коммит
6dadad9e91
|
@ -960,9 +960,7 @@ FaviconLoadListener::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
sniffer->GetMIMETypeFromContent(
|
sniffer->GetMIMETypeFromContent(
|
||||||
#ifndef MOZILLA_1_8_BRANCH
|
|
||||||
aRequest,
|
aRequest,
|
||||||
#endif
|
|
||||||
reinterpret_cast<PRUint8*>(const_cast<char*>(mData.get())),
|
reinterpret_cast<PRUint8*>(const_cast<char*>(mData.get())),
|
||||||
mData.Length(), mimeType);
|
mData.Length(), mimeType);
|
||||||
// ignore errors: mime type will be left empty and we'll try the next sniffer
|
// ignore errors: mime type will be left empty and we'll try the next sniffer
|
||||||
|
|
|
@ -129,5 +129,9 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
#define FAVICON_DEFAULT_URL "chrome://mozapps/skin/places/defaultFavicon.png"
|
#define FAVICON_DEFAULT_URL "chrome://mozapps/skin/places/defaultFavicon.png"
|
||||||
|
#ifdef MOZ_WIDGET_GTK2
|
||||||
|
#define FAVICON_ERRORPAGE_URL "moz-icon://stock/gtk-dialog-warning?size=menu"
|
||||||
|
#else
|
||||||
#define FAVICON_ERRORPAGE_URL "chrome://global/skin/icons/warning-16.png"
|
#define FAVICON_ERRORPAGE_URL "chrome://global/skin/icons/warning-16.png"
|
||||||
|
#endif
|
||||||
#define FAVICON_ANNOTATION_NAME "favicon"
|
#define FAVICON_ANNOTATION_NAME "favicon"
|
||||||
|
|
|
@ -43,10 +43,6 @@
|
||||||
#include "nsWeakReference.h"
|
#include "nsWeakReference.h"
|
||||||
#include "nsTArray.h"
|
#include "nsTArray.h"
|
||||||
|
|
||||||
#ifdef MOZILLA_1_8_BRANCH
|
|
||||||
#define NS_GET_TEMPLATE_IID NS_GET_IID
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// nsMaybeWeakPtr is a helper object to hold a strong-or-weak reference
|
// nsMaybeWeakPtr is a helper object to hold a strong-or-weak reference
|
||||||
// to the template class. It's pretty minimal, but sufficient.
|
// to the template class. It's pretty minimal, but sufficient.
|
||||||
|
|
||||||
|
|
|
@ -4476,7 +4476,6 @@ nsNavHistory::GetPageTitle(nsIURI* aURI, nsAString& aTitle)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifndef MOZILLA_1_8_BRANCH
|
|
||||||
// nsNavHistory::GetURIGeckoFlags
|
// nsNavHistory::GetURIGeckoFlags
|
||||||
//
|
//
|
||||||
// FIXME: should we try to use annotations for this stuff?
|
// FIXME: should we try to use annotations for this stuff?
|
||||||
|
@ -4497,7 +4496,6 @@ nsNavHistory::SetURIGeckoFlags(nsIURI* aURI, PRUint32 aFlags)
|
||||||
{
|
{
|
||||||
return NS_ERROR_NOT_IMPLEMENTED;
|
return NS_ERROR_NOT_IMPLEMENTED;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
// nsIGlobalHistory3 ***********************************************************
|
// nsIGlobalHistory3 ***********************************************************
|
||||||
|
|
||||||
|
|
|
@ -59,11 +59,7 @@ public:
|
||||||
nsNavHistoryQuery();
|
nsNavHistoryQuery();
|
||||||
// note: we use a copy constructor in Clone(), the default is good enough
|
// note: we use a copy constructor in Clone(), the default is good enough
|
||||||
|
|
||||||
#ifdef MOZILLA_1_8_BRANCH
|
|
||||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERY_IID)
|
|
||||||
#else
|
|
||||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERY_IID)
|
NS_DECLARE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERY_IID)
|
||||||
#endif
|
|
||||||
NS_DECL_ISUPPORTS
|
NS_DECL_ISUPPORTS
|
||||||
NS_DECL_NSINAVHISTORYQUERY
|
NS_DECL_NSINAVHISTORYQUERY
|
||||||
|
|
||||||
|
@ -105,9 +101,7 @@ protected:
|
||||||
nsTArray<PRInt64> mFolders;
|
nsTArray<PRInt64> mFolders;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef MOZILLA_1_8_BRANCH
|
|
||||||
NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryQuery, NS_NAVHISTORYQUERY_IID)
|
NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryQuery, NS_NAVHISTORYQUERY_IID)
|
||||||
#endif
|
|
||||||
|
|
||||||
// nsNavHistoryQueryOptions
|
// nsNavHistoryQueryOptions
|
||||||
|
|
||||||
|
@ -128,11 +122,7 @@ public:
|
||||||
mQueryType(nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY)
|
mQueryType(nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
#ifdef MOZILLA_1_8_BRANCH
|
|
||||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERYOPTIONS_IID)
|
|
||||||
#else
|
|
||||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERYOPTIONS_IID)
|
NS_DECLARE_STATIC_IID_ACCESSOR(NS_NAVHISTORYQUERYOPTIONS_IID)
|
||||||
#endif
|
|
||||||
|
|
||||||
NS_DECL_ISUPPORTS
|
NS_DECL_ISUPPORTS
|
||||||
NS_DECL_NSINAVHISTORYQUERYOPTIONS
|
NS_DECL_NSINAVHISTORYQUERYOPTIONS
|
||||||
|
@ -173,9 +163,7 @@ private:
|
||||||
PRUint16 mQueryType;
|
PRUint16 mQueryType;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef MOZILLA_1_8_BRANCH
|
|
||||||
NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryQueryOptions, NS_NAVHISTORYQUERYOPTIONS_IID)
|
NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryQueryOptions, NS_NAVHISTORYQUERYOPTIONS_IID)
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // nsNavHistoryQuery_h_
|
#endif // nsNavHistoryQuery_h_
|
||||||
|
|
||||||
|
|
|
@ -68,11 +68,7 @@ template <class E> class nsTArray;
|
||||||
class nsIFormHistoryPrivate : public nsISupports
|
class nsIFormHistoryPrivate : public nsISupports
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
#ifdef MOZILLA_1_8_BRANCH
|
|
||||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMHISTORYPRIVATE_IID)
|
|
||||||
#else
|
|
||||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFORMHISTORYPRIVATE_IID)
|
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFORMHISTORYPRIVATE_IID)
|
||||||
#endif
|
|
||||||
|
|
||||||
mozIStorageConnection* GetStorageConnection() { return mDBConn; }
|
mozIStorageConnection* GetStorageConnection() { return mDBConn; }
|
||||||
|
|
||||||
|
@ -80,9 +76,7 @@ class nsIFormHistoryPrivate : public nsISupports
|
||||||
nsCOMPtr<mozIStorageConnection> mDBConn;
|
nsCOMPtr<mozIStorageConnection> mDBConn;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifndef MOZILLA_1_8_BRANCH
|
|
||||||
NS_DEFINE_STATIC_IID_ACCESSOR(nsIFormHistoryPrivate, NS_IFORMHISTORYPRIVATE_IID)
|
NS_DEFINE_STATIC_IID_ACCESSOR(nsIFormHistoryPrivate, NS_IFORMHISTORYPRIVATE_IID)
|
||||||
#endif
|
|
||||||
|
|
||||||
class nsFormHistory : public nsIFormHistory2,
|
class nsFormHistory : public nsIFormHistory2,
|
||||||
public nsIFormHistoryPrivate,
|
public nsIFormHistoryPrivate,
|
||||||
|
|
|
@ -75,11 +75,7 @@ public:
|
||||||
|
|
||||||
static nsUrlClassifierDBService* GetInstance(nsresult *result);
|
static nsUrlClassifierDBService* GetInstance(nsresult *result);
|
||||||
|
|
||||||
#ifdef MOZILLA_1_8_BRANCH
|
|
||||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_URLCLASSIFIERDBSERVICE_CID)
|
|
||||||
#else
|
|
||||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_URLCLASSIFIERDBSERVICE_CID)
|
NS_DECLARE_STATIC_IID_ACCESSOR(NS_URLCLASSIFIERDBSERVICE_CID)
|
||||||
#endif
|
|
||||||
|
|
||||||
NS_DECL_ISUPPORTS
|
NS_DECL_ISUPPORTS
|
||||||
NS_DECL_NSIURLCLASSIFIERDBSERVICE
|
NS_DECL_NSIURLCLASSIFIERDBSERVICE
|
||||||
|
|
Загрузка…
Ссылка в новой задаче