--- a/appinstaller/AppinstUi/sisxsifplugin/inc/sisxsifpluginactiveimpl.h	Mon May 03 12:38:03 2010 +0300
+++ b/appinstaller/AppinstUi/sisxsifplugin/inc/sisxsifpluginactiveimpl.h	Fri May 14 15:58:48 2010 +0300
@@ -80,18 +80,20 @@
         void CommonRequestPreamble( const COpaqueNamedParams& aInputParams,
                 COpaqueNamedParams& aOutputParams, TRequestStatus& aStatus );
         void CompleteClientRequest( TInt aResult );
-        void DoInstallL( const TDesC& aFileName );
         void DoUninstallL( TComponentId aComponentId );
         void DoActivateL( TComponentId aComponentId );
         void DoDeactivateL( TComponentId aComponentId );
+        void DoHandleErrorL( TInt aError );
         TInt ConvertToSifErrorCode( TInt aSwiErrorCode );
+        void SetInstallFileL( const TDesC& aFileName );
+        void SetInstallFile( RFile& aFileHandle );
         TComponentId GetLastInstalledComponentIdL();
-        TBool RequiresUserCapabilityL();
-        void ProcessSilentInstallL();
-        void ProcessSilentUninstallL();
-        void SetSilentInstallFileL( const TDesC& aFileName );
-        void SetSilentInstallFile( RFile& aFileHandle );
-        static TInt GrantCapabilitiesHelpCallback( TAny* aPtr );
+        TBool RequiresUserCapabilityL( const CComponentInfo::CNode& aRootNode );
+        void StartInstallingL();
+        void StartSilentInstallingL();
+        void StartSilentUninstallingL();
+        void FinalizeInstallationL();
+        void UpdateStartupListL();
 
     private:    // data
         RFs iFs;
@@ -106,8 +108,6 @@
         HBufC* iFileName;
         RFile* iFileHandle;             // not owned
         TBool iUseSilentMode;
-        TBool iIsPackageCheckedForSilentInstall;
-
         enum TOperationType
             {
             ENone,
@@ -116,8 +116,14 @@
             EUninstall,
             EActivate,
             EDeactivate
-            };
-        TOperationType iOperation;
+            } iOperation;
+        enum TPhase
+            {
+            ENotActive,
+            EPreprocessing,
+            ERunningOperation,
+            EPostprocessing
+            } iPhase;
         };
 
 }   // namespace Usif