--- a/omadrm/drmplugins/drmrohandler/inc/rohandlerdmgrwrapper.h	Tue Aug 31 15:29:38 2010 +0300
+++ b/omadrm/drmplugins/drmrohandler/inc/rohandlerdmgrwrapper.h	Wed Sep 01 12:21:16 2010 +0100
@@ -19,23 +19,25 @@
 #ifndef ROHANDLERDMGRWRAPPER_H
 #define ROHANDLERDMGRWRAPPER_H
 
-#include <e32base.h>
-#include <f32file.h>
-
-#include <RoapObserver.h>
-#include <RoapEng.h>
-
-#include <qobject.h>
-#include <downloadmanager.h>
-#include <download.h>
+namespace Roap
+    {
+    class MRoapObserver;
+    }
 
 class CDRMRights;
-class QRoHandlerDMgrEventHandler;
+
+class MHttpDownloadMgrObserver;
 
 class MRoHandlerDMgrWrapper
     {
+
 public:
     virtual void HandleRoapTriggerL( const TDesC8& aTrigger ) = 0;
+
+    virtual void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl ) = 0;
+
+    virtual void DownloadAndHandleRoapTriggerFromPrUrlL( const HBufC8* aUrl ) = 0;
+
     };
 
 /**
@@ -44,6 +46,7 @@
 */
 class CRoHandlerDMgrWrapper:
     public CActive, // Now active
+    public MHttpDownloadMgrObserver,
     public Roap::MRoapObserver,
     public MRoHandlerDMgrWrapper
     {
@@ -75,6 +78,23 @@
     */
     void HandleRoapTriggerL( const TDesC8& aTrigger );
 
+    void DownloadAndHandleRoapTriggerL( const HBufC8* aUrl );
+
+    void DownloadAndHandleRoapTriggerFromPrUrlL( const HBufC8* aUrl );
+
+
+// from base class MHttpDownloadMgrObserver
+
+    /**
+    * From MHttpDownloadMgrObserver.
+    * Handle download manager events
+    *
+    * @since S60 3.2
+    * @param aDownload the download
+    * @param aEvent the event
+    */
+    void HandleDMgrEventL( RHttpDownload& aDownload, THttpDownloadEvent aEvent );
+
 // From Roap::MRoapObserver
     /**
     * ConnectionConfL
@@ -201,13 +221,6 @@
     * @leave  System wide error code */
     void PostResponseUrlL( const TDesC8& aPostResponseUrl );
 
-    /**
-	* Handle download manager events
-	*
-	* @param aEvent the event
-	*/
-	void HandleDownloadEventL( WRT::DownloadEvent* aEvent );
-
 protected:
     //from Cactive
     virtual void DoCancel();
@@ -243,9 +256,8 @@
     /**
     * Download manager session
     */
-    WRT::DownloadManager* iDlMgr;
+    RHttpDownloadMgr iDlMgr;
 
-    WRT::Download* iDownload;
     /**
     * Used to make downloads synchronous
     */
@@ -275,9 +287,6 @@
     RFs iFs;
 
     HBufC* iFileName;
-    
-    QRoHandlerDMgrEventHandler* iRoHandlerDMgrEventHandler;
-    
     };
 
 #endif // ROHANDLERDMGRWRAPPER_H