moving phoenix history from browser to toolkit to fix bustage, sr=bryner
git-svn-id: svn://10.0.0.236/trunk@130687 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
349fcd92ec
commit
177ff8cc27
@ -38,7 +38,7 @@ REQUIRES = xpcom \
|
|||||||
necko \
|
necko \
|
||||||
uriloader \
|
uriloader \
|
||||||
history \
|
history \
|
||||||
browsercomps \
|
toolkitcomps \
|
||||||
shistory \
|
shistory \
|
||||||
webshell \
|
webshell \
|
||||||
windowwatcher \
|
windowwatcher \
|
||||||
|
|||||||
@ -67,7 +67,7 @@
|
|||||||
#include "nsISecureBrowserUI.h"
|
#include "nsISecureBrowserUI.h"
|
||||||
|
|
||||||
#ifdef MOZ_PHOENIX
|
#ifdef MOZ_PHOENIX
|
||||||
#include "nsBrowserCompsCID.h"
|
#include "nsToolkitCompsCID.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);
|
static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID);
|
||||||
|
|||||||
@ -51,7 +51,7 @@ REQUIRES = xpcom \
|
|||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifdef MOZ_PHOENIX
|
ifdef MOZ_PHOENIX
|
||||||
REQUIRES += browsercomps history
|
REQUIRES += toolkitcomps history
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CPPSRCS = \
|
CPPSRCS = \
|
||||||
|
|||||||
@ -103,7 +103,7 @@
|
|||||||
#include "nsIProxyObjectManager.h"
|
#include "nsIProxyObjectManager.h"
|
||||||
|
|
||||||
#ifdef MOZ_PHOENIX
|
#ifdef MOZ_PHOENIX
|
||||||
#include "nsBrowserCompsCID.h"
|
#include "nsToolkitCompsCID.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "nsBrowserStatusFilter.h"
|
#include "nsBrowserStatusFilter.h"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user