equal
deleted
inserted
replaced
34 #include <SWInstDefs.h> |
34 #include <SWInstDefs.h> |
35 #include <featmgr.h> |
35 #include <featmgr.h> |
36 #include <SWInstFileTaskParam.h> |
36 #include <SWInstFileTaskParam.h> |
37 #include <e32property.h> |
37 #include <e32property.h> |
38 #include <SWInstallerInternalPSKeys.h> |
38 #include <SWInstallerInternalPSKeys.h> |
39 #include <Oma2Agent.h> |
39 #include <Oma2Agent.h> // KOmaDrm2AgentName |
40 #include <syslangutil.h> |
40 #include <syslangutil.h> |
41 |
41 #include <caf/manager.h> // ContentAccess::CManager |
42 #include <caf/caf.h> |
42 #include <caf/agent.h> // ContentAccess::TAgent |
43 //#include <caf/content.h> |
|
44 //#include <caf/stringattributeset.h> |
|
45 //#include <caf/attributeset.h> |
|
46 |
43 |
47 #include <DcfEntry.h> // JPAA-7GEB7P |
44 #include <DcfEntry.h> // JPAA-7GEB7P |
48 #include <DcfRep.h> // JPAA-7GEB7P |
45 #include <DcfRep.h> // JPAA-7GEB7P |
49 |
46 |
50 #include "SisxUIOperationWatcher.h" |
47 #include "SisxUIOperationWatcher.h" |
1226 // CSisxUIOperationWatcher::GetCafDataL |
1223 // CSisxUIOperationWatcher::GetCafDataL |
1227 // Handles searching correct DRM agent and manager. |
1224 // Handles searching correct DRM agent and manager. |
1228 // (other items were commented in a header). |
1225 // (other items were commented in a header). |
1229 // ----------------------------------------------------------------------------- |
1226 // ----------------------------------------------------------------------------- |
1230 // |
1227 // |
1231 ContentAccess::CManager* CSisxUIOperationWatcher::GetCafDataL( TAgent& aAgent ) |
1228 ContentAccess::CManager* CSisxUIOperationWatcher::GetCafDataL( ContentAccess::TAgent& aAgent ) |
1232 { |
1229 { |
1233 RArray<TAgent> agents; |
1230 RArray<TAgent> agents; |
1234 |
1231 |
1235 CleanupClosePushL( agents ); |
1232 CleanupClosePushL( agents ); |
1236 CManager* manager = CManager::NewLC(); |
1233 CManager* manager = CManager::NewLC(); |
1243 { |
1240 { |
1244 aAgent = agents[i]; |
1241 aAgent = agents[i]; |
1245 break; |
1242 break; |
1246 } |
1243 } |
1247 } |
1244 } |
1248 CleanupStack::Pop(); // manager |
1245 CleanupStack::Pop( manager ); |
1249 CleanupStack::PopAndDestroy(); // agents |
1246 CleanupStack::PopAndDestroy( &agents ); |
1250 return manager; |
1247 return manager; |
1251 } |
1248 } |
1252 |
1249 |
1253 // ----------------------------------------------------------------------------- |
1250 // ----------------------------------------------------------------------------- |
1254 // CSisxUIOperationWatcher::RegisterContentToDCF |
1251 // CSisxUIOperationWatcher::RegisterContentToDCF |