# HG changeset patch
# User hgs
# Date 1278609697 -10800
# Node ID 5ebe1934bb32ccfaa39bbfb42c6b0085f8a95f77
# Parent  d752ced89971238c67f6d6ec394d61bb8e751a2e
201027_01

diff -r d752ced89971 -r 5ebe1934bb32 drm_plat/drm_common_api/tsrc/data/mmc/DRM/content.dcf
diff -r d752ced89971 -r 5ebe1934bb32 drm_plat/drm_rights_api/tsrc/data/c/content.dcf
diff -r d752ced89971 -r 5ebe1934bb32 drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/data/content.dcf
diff -r d752ced89971 -r 5ebe1934bb32 omadrm/drmengine/agentv2/src/Oma2AgentContent.cpp
--- a/omadrm/drmengine/agentv2/src/Oma2AgentContent.cpp	Mon Jun 28 15:55:28 2010 +0300
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentContent.cpp	Thu Jul 08 20:21:37 2010 +0300
@@ -25,9 +25,7 @@
 #include <e32test.h>
 #include <utf.h>
 
-
-//#include <SchemeHandler.h>
-
+#include <drmbrowserlauncher.h>
 
 #include "Oma2AgentContent.h"
 #include "Oma2AgentAttributes.h"
@@ -604,11 +602,9 @@
     {
     TRequestStatus *ptr = &aStatus;
     TInt r;
-    //HBufC* b = NULL;
+    HBufC* b = NULL;
 
     r = KErrNotSupported;
-/*
-    CSchemeHandler* handler = NULL;
 
     r = iDcf->OpenPart(aUniqueId);
     if (r == KErrNone && iDcf->iRightsIssuerURL != NULL)
@@ -617,17 +613,17 @@
             *iDcf->iRightsIssuerURL));
         if (b != NULL)
             {
-            TRAP(r, handler = CSchemeHandler::NewL(*b));
-            if (handler != NULL)
-                {
-                TRAP(r, handler->HandleUrlStandaloneL());
-                delete handler;
-                }
+    				DRM::CDrmBrowserLauncher* browserLauncher = DRM::CDrmBrowserLauncher::NewLC();
+    	
+				    browserLauncher->LaunchUrlL(*b);
+    
+    				CleanupStack::PopAndDestroy(); // browserLauncher
+   
             delete b;
             }
         }
-*/
-    User::RequestComplete(ptr, r);
+
+		User::RequestComplete(ptr, r);
     }
 
 // -----------------------------------------------------------------------------
diff -r d752ced89971 -r 5ebe1934bb32 omadrm/drmengine/group/OmaDrmAgent.mmp
--- a/omadrm/drmengine/group/OmaDrmAgent.mmp	Mon Jun 28 15:55:28 2010 +0300
+++ b/omadrm/drmengine/group/OmaDrmAgent.mmp	Thu Jul 08 20:21:37 2010 +0300
@@ -77,5 +77,6 @@
 LIBRARY			ws32.lib
 LIBRARY			sysutil.lib
 LIBRARY         centralrepository.lib
+LIBRARY         drmbrowserlauncher.lib
 
 SMPSAFE
diff -r d752ced89971 -r 5ebe1934bb32 omadrm/drmplugins/drmromtm/group/bld.inf
--- a/omadrm/drmplugins/drmromtm/group/bld.inf	Mon Jun 28 15:55:28 2010 +0300
+++ b/omadrm/drmplugins/drmromtm/group/bld.inf	Thu Jul 08 20:21:37 2010 +0300
@@ -19,12 +19,10 @@
 #include <platform_paths.hrh>
 
 PRJ_PLATFORMS
-    DEFAULT -ARMI
+DEFAULT
 
 
 PRJ_EXPORTS
-../client/inc/romtmcli.h
-../server/inc/romtmser.h
 ../loc/romtmui.loc MW_LAYER_LOC_EXPORT_PATH( romtmui.loc )
 
 
@@ -35,4 +33,4 @@
 RoMtmUi.mmp
 RoMtmDat.mmp
 
-//  End of File  
+//  End of File
diff -r d752ced89971 -r 5ebe1934bb32 omadrm/drmplugins/drmromtm/ui/src/RoMtmUi.cpp
--- a/omadrm/drmplugins/drmromtm/ui/src/RoMtmUi.cpp	Mon Jun 28 15:55:28 2010 +0300
+++ b/omadrm/drmplugins/drmromtm/ui/src/RoMtmUi.cpp	Thu Jul 08 20:21:37 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -52,6 +52,8 @@
 #include <RoMtmUi.rsg> // test
 #include "drmmsgwatcherobserver.h"
 
+#include "cleanupresetanddestroy.h"
+
 // EXTERNAL DATA STRUCTURES
 // EXTERNAL FUNCTION PROTOTYPES
 // CONSTANTS
@@ -566,7 +568,7 @@
     CRichText& body = BaseMtm().Body();
     TPtrC ptr16( body.Read(0) );
     //const TUid KUidDRMUI = { 0x101f85c7 };
-    CDrmMsgWatcherObserver* operation = NULL;
+    CMsvOperation* operation( NULL );
 
     if ( iType == ERoapTrigger || iType == ERoapTriggerRoAcquisition )
         {
@@ -580,36 +582,39 @@
         ptr.Append(ptr16.Right(ptr16.Length()-4));
 
         show = ShowQueryL(ptr);
+
         if (!show)
             {
-            CleanupStack::PopAndDestroy(filename);
-            return CompletedOperationL( aStatus );
+            operation = CompletedOperationL( aStatus );
+            }
+        else
+            {
+            operation = CDrmMsgWatcherObserver::NewL(
+                    Session(),
+                    CActive::EPriorityStandard,
+                    aStatus,
+                    Type(),
+                    ptr,
+                    type );
             }
 
-	operation = CDrmMsgWatcherObserver::NewL( 
-            Session(),
-            CActive::EPriorityStandard,
-            aStatus,
-            Type(),
-            ptr,
-            type );
+        CleanupStack::PopAndDestroy(filename);
         }
     else
         {
-
         CAiwGenericParamList* paramList = CAiwGenericParamList::NewLC();
         TAiwVariant variantObject( ptr16 );
         TAiwGenericParam param( EGenericParamFile, variantObject );
         paramList->AppendL( param );
 
-	operation = CDrmMsgWatcherObserver::NewL( 
-            Session(),
-            CActive::EPriorityStandard,
-            aStatus,
-            Type(),
-            paramList );
+        operation = CDrmMsgWatcherObserver::NewL(
+                Session(),
+                CActive::EPriorityStandard,
+                aStatus,
+                Type(),
+                paramList );
 
-        CleanupStack::PopAndDestroy( paramList ); // paramList
+        CleanupStack::PopAndDestroy( paramList );
         }
 
     return operation;
@@ -765,9 +770,9 @@
     CleanupStack::PushL(buf);
     roap = Roap::CRoapEng::NewL();
     CleanupStack::PushL(roap);
+    CleanupResetAndDestroyPushL(array);
     roap->SetTriggerL(ptr,NULL,type,status,op,array);
-    array.ResetAndDestroy();
-    array.Close();
+    CleanupStack::PopAndDestroy(&array);
     CleanupStack::PopAndDestroy(roap);
     CleanupStack::PopAndDestroy(buf);