diff -r 641f389e9157 -r a71299154b21 contentmgmt/contentaccessfwfordrm/source/caf/resolver.cpp --- a/contentmgmt/contentaccessfwfordrm/source/caf/resolver.cpp Tue Aug 31 17:00:08 2010 +0300 +++ b/contentmgmt/contentaccessfwfordrm/source/caf/resolver.cpp Wed Sep 01 12:40:57 2010 +0100 @@ -353,75 +353,6 @@ return *iDefaultAgent; } -#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT - -CAgentInfo& CAgentResolver::ResolveFileL(const TDesC8& aHeaderData) - { - // Go through all the agents and return the one which supports the given WMDRM content. - - TInt agentsCount(iAgentInfos.Count()); - CAgentManager* agentManager = NULL; - - for (TInt i = 0; i < agentsCount; ++i) - { - TRAPD(result, agentManager = &iAgentInfos[i]->AgentManagerL()); - if(result != KErrNone) - { - if(KErrNoMemory == result) - { - User::Leave(result); - } - else - { - continue; - } - } - - if (agentManager->IsRecognizedL(aHeaderData)) - { - return *iAgentInfos[i]; - } - } - - // will never reach here - return *iDefaultAgent; - } - - -EXPORT_C TBool CAgentResolver::DoRecognizeL(const TDesC8& aHeader, TDes8& aFileMimeType, TDes8& aContentMimeType) - { - // Go through all the agents and return the one which supports the given WMDRM content. - TInt agentsCount(iAgentInfos.Count()); - CAgentManager* agentManager = NULL; - for (TInt i = 0; i < agentsCount; ++i) - { - TRAPD(result, agentManager = &iAgentInfos[i]->AgentManagerL()); - if(result != KErrNone) - { - if(KErrNoMemory == result) - { - User::Leave(result); - } - else - { - continue; - } - } - - if (agentManager->RecognizeContentL(aHeader, aFileMimeType, aContentMimeType)) - { - // force to lower case to ensure that chosen lower case scheme for mime types is maintained - aFileMimeType.LowerCase(); - aContentMimeType.LowerCase(); - return ETrue; - } - } - - return EFalse; - } - -#endif //#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT - TUid CAgentResolver::ResolveDirectory(const TDesC& aPath, TDes& aActualPath, TBool& aThePrivateDir) const { TInt i = 0;