diff -r 6cadd6867c17 -r 67f2ed48ad91 menucontentsrv/srvinc/mcsdrmhandler.h --- a/menucontentsrv/srvinc/mcsdrmhandler.h Wed Sep 15 12:32:36 2010 +0300 +++ b/menucontentsrv/srvinc/mcsdrmhandler.h Wed Oct 13 14:53:46 2010 +0300 @@ -32,24 +32,24 @@ * @lib mcsmenu.lib * @since S60 v5.0 */ -NONSHARABLE_CLASS( CMcsDrmHandler ): +NONSHARABLE_CLASS( CMcsDrmHandler ): public CBase, public MMcsInstallListener, public MMcsDrmObserver, public MMcsDrmAppScanner { public: - + /** * Two-phased constructor. Leaves on failure. * @return The constructed object. */ - - static CMcsDrmHandler* NewL( + + static CMcsDrmHandler* NewL( CMenuSrvEng& aSrvEng, CMenuSrvEngUtils& aUtils, CMcsCacheHandler& aCacheHandler ); - + /** * Destructor. * @since S60 v5.0 @@ -58,25 +58,24 @@ * @panic None. */ virtual ~CMcsDrmHandler(); - + void HandleDrmEvent( TUid aUid ); - + void HandleDrmAppEvent(); - + void EngineEvents( TInt aFolder, TInt aEvents ); /** * Handle Install Event */ - void HandleInstallNotifyL( TUid aPackageUid, - CMcsInstallNotifier::TNotificationType aNotificationType ); - + void HandleInstallNotifyL(TInt aPackageUid); + private: /** * Constructor. */ - CMcsDrmHandler( + CMcsDrmHandler( CMenuSrvEng& aSrvEng, CMenuSrvEngUtils& aUtils, CMcsCacheHandler& aCacheHandler ); @@ -85,27 +84,27 @@ * 2nd phase constructor. */ void ConstructL(); - - void AddRemoveObserversL( + + void AddRemoveObserversL( const RArray& aDrmProtectedArray ); - + TInt AppFolderIdL( TUid aUid ); - + private: // data - + RMcsDrmObserverManager iObserversManager; - - + + CMenuSrvEng& iSrvEng; ///< Menu Engine. Not own. - + CMenuSrvEngUtils& iUtils; - + CMcsCacheHandler& iCacheHandler; - + CMcsDrmScanner* iScanner; - + CMcsInstallNotifier* iInstallNotifier; - + }; #endif // __MCSDRMHANDLER_H__