--- a/omadrm/drmengine/agentv2/src/Oma2AgentContent.cpp Thu Aug 19 10:12:10 2010 +0300
+++ b/omadrm/drmengine/agentv2/src/Oma2AgentContent.cpp Tue Aug 31 15:29:38 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"
@@ -25,9 +25,7 @@
#include <e32test.h>
#include <utf.h>
-
-#include <schemehandler.h>
-
+#include <drmbrowserlauncher.h>
#include "Oma2AgentContent.h"
#include "Oma2AgentAttributes.h"
@@ -545,7 +543,6 @@
// -----------------------------------------------------------------------------
// COma2AgentContent::NotifyStatusChange
-//
// -----------------------------------------------------------------------------
//
void COma2AgentContent::NotifyStatusChange(
@@ -606,7 +603,8 @@
TRequestStatus *ptr = &aStatus;
TInt r;
HBufC* b = NULL;
- CSchemeHandler* handler = NULL;
+
+ r = KErrNotSupported;
r = iDcf->OpenPart(aUniqueId);
if (r == KErrNone && iDcf->iRightsIssuerURL != NULL)
@@ -615,16 +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);
}
// -----------------------------------------------------------------------------