Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 104118 - a non-rdf contractid for windowmediator, to reduce dependencies. r=mkaply, sr=dveditz

Browse Source
This commit is contained in:
alecf%netscape.com 2001-10-12 21:03:40 +00:00
parent 8d587ce55b
commit cf011f78cd
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xpfe/appshell/public/nsIWindowMediator.idl
View File

@ -41,6 +41,9 @@
%{C++
#define NS_WINDOWMEDIATOR_CID \
{ 0x0659cb83, 0xfaad, 0x11d2, { 0x8e, 0x19, 0xb2, 0x06, 0x62, 0x0a, 0x65, 0x7c } }
#define NS_WINDOWMEDIATOR_CONTRACTID \
"@mozilla.org/appshell/window-mediator;1"
%}
interface nsIXULWindow;

1
xpfe/bootstrap/Makefile.in
View File

@ -58,7 +58,6 @@ REQUIRES += \
intl \
profile \
xpconnect \
rdf \
$(NULL)
endif

2
xpfe/bootstrap/makefile.win
View File

@ -31,11 +31,9 @@ REQUIRES = xpcom \
appshell \
layout \
chrome \
rdf \
xpinstall \
xpicleanup \
uriloader \
editor \
view \
windowwatcher \
embed_base \

3
xpfe/bootstrap/nsNativeAppSupportOS2.cpp
View File

@ -44,7 +44,6 @@
#include "nsIWidget.h"
#include "nsIAppShellService.h"
#include "nsIProfileInternal.h"
#include "rdf.h"
#include "nsIXULWindow.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
@ -112,7 +111,7 @@ static
nsresult
GetMostRecentWindow(const PRUnichar* aType, nsIDOMWindowInternal** aWindow) {
nsresult rv;
nsCOMPtr<nsIWindowMediator> med( do_GetService( NS_RDF_DATASOURCE_CONTRACTID_PREFIX "window-mediator", &rv ) );
nsCOMPtr<nsIWindowMediator> med( do_GetService( NS_WINDOWMEDIATOR_CONTRACTID, &rv ) );
if ( NS_FAILED( rv ) )
return rv;

3
xpfe/bootstrap/nsNativeAppSupportWin.cpp
View File

@ -59,7 +59,6 @@
#include "nsIWidget.h"
#include "nsIAppShellService.h"
#include "nsIProfileInternal.h"
#include "rdf.h"
#include "nsIXULWindow.h"
#include "nsIInterfaceRequestor.h"
#include "nsIInterfaceRequestorUtils.h"
@ -114,7 +113,7 @@ static
nsresult
GetMostRecentWindow(const PRUnichar* aType, nsIDOMWindowInternal** aWindow) {
nsresult rv;
nsCOMPtr<nsIWindowMediator> med( do_GetService( NS_RDF_DATASOURCE_CONTRACTID_PREFIX "window-mediator", &rv ) );
nsCOMPtr<nsIWindowMediator> med( do_GetService( NS_WINDOWMEDIATOR_CONTRACTID, &rv ) );
if ( NS_FAILED( rv ) )
return rv;