Bug 408808 - "nsProxiedService.h should not use NS_GetProxyForObject" [p=prasad@medhas.org (Prasad Sunkari [prasad]) r=bsmedberg sr=Neil a1.9=schrep]
git-svn-id: svn://10.0.0.236/trunk@243352 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -39,8 +39,9 @@
|
||||
#ifndef nsProxiedService_h__
|
||||
#define nsProxiedService_h__
|
||||
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
#include "nsIProxyObjectManager.h"
|
||||
#include "nsXPCOMCIDInternal.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// NS_WITH_PROXIED_SERVICE: macro to make using services that need to be proxied
|
||||
@@ -125,11 +126,15 @@ private:
|
||||
if (always)
|
||||
proxyType |= NS_PROXY_ALWAYS;
|
||||
|
||||
*rv = NS_GetProxyForObject(aTarget,
|
||||
aIID,
|
||||
aObj,
|
||||
proxyType,
|
||||
getter_AddRefs(mProxiedService));
|
||||
nsCOMPtr<nsIProxyObjectManager> proxyObjMgr = do_GetService(NS_XPCOMPROXY_CONTRACTID, rv);
|
||||
if (NS_FAILED(*rv))
|
||||
return;
|
||||
|
||||
*rv = proxyObjMgr->GetProxyForObject(aTarget,
|
||||
aIID,
|
||||
aObj,
|
||||
proxyType,
|
||||
getter_AddRefs(mProxiedService));
|
||||
}
|
||||
|
||||
nsCOMPtr<nsISupports> mProxiedService;
|
||||
|
||||
Reference in New Issue
Block a user