browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp
branchRCL_3
changeset 48 79859ed3eea9
parent 40 8bfb9186a8b8
child 49 919f36ff910f
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -20,14 +20,14 @@
 // INCLUDE FILES
 #include    "CDownloadUtils.h" 
 #include    "UiLibLogger.h"
-#include    <downloadmgrclient.h>
+#include    <DownloadMgrClient.h>
 #include    <DocumentHandler.h>
 #include    <Oma2Agent.h>
 #include    <DRMCommon.h>
 #include	<apgcli.h>
 #include    <caf/caf.h>
 #include    <utf.h>
-#include    <Browser_Platform_Variant.hrh>
+#include    <Browser_platform_variant.hrh>
 // LOCAL CONSTANTS AND MACROS
 
 #ifdef BRDO_WML_DISABLED_FF
@@ -46,7 +46,6 @@
 _LIT8(Krng, "application/vnd.nokia.ringing-tone");
 _LIT8(Krn, "application/vnd.rn-realmedia");
 _LIT8(Kpn, "application/x-pn-realmedia");
-_LIT8(KWmdrmLicenseResponseContentType,"application/vnd.ms-wmdrm.lic-resp" );
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -237,7 +236,7 @@
         CleanupStack::PopAndDestroy( docHandler ); // docHandler
 
         if ( !(aContentType.Compare(KOma2RoContentType)) || !(aContentType.Compare(KOma2ProtectedRoType))
-            || !(aContentType.Compare(KOma2TriggerContentType)) || !(aContentType.Compare(KWmdrmLicenseResponseContentType)) )
+            || !(aContentType.Compare(KOma2TriggerContentType)) )
             {
             canOpen = EFalse;
             }
@@ -274,11 +273,6 @@
     	return EFalse; 
         }
 #endif         
-    else if ( !(aContentType.Compare(KOma2RoContentType)) || !(aContentType.Compare(KOma2ProtectedRoType))
-        || !(aContentType.Compare(KOma2TriggerContentType)) || !(aContentType.Compare(KWmdrmLicenseResponseContentType)) )
-        {
-        return EFalse;
-        }
     else
         {
         TBool canOpen( EFalse );
@@ -479,7 +473,7 @@
     
     if (ret == KErrNone &&
         (dataType.iConfidence == CApaDataRecognizerType::ECertain) ||
-        (dataType.iConfidence == CApaDataRecognizerType::EProbable) ||(dataType.iConfidence == CApaDataRecognizerType::EPossible))
+        (dataType.iConfidence == CApaDataRecognizerType::EProbable))
         {
         // If the file type was found, try to match it to a known file type
         TPtrC8 mimeTypePtr = dataType.iDataType.Des8();