--- a/idlefw/src/idleint/aiuiidleintegrationimpl.h	Fri Feb 19 23:07:29 2010 +0200
+++ b/idlefw/src/idleint/aiuiidleintegrationimpl.h	Fri Mar 12 15:43:54 2010 +0200
@@ -19,9 +19,13 @@
 #ifndef C_AIUIIDLEINTEGRATIONIMPL_H
 #define C_AIUIIDLEINTEGRATIONIMPL_H
 
+// System includes
+#include <e32property.h>
+
+// User includes
 #include "aiuiidleintegration.h"
-#include <startupdomainpskeys.h>
 
+// Forward declarations
 class CActiveIdleState;
 class CAknIncallBubble;
 class MAiPSPropertyObserver;
@@ -32,7 +36,8 @@
  */
 NONSHARABLE_CLASS( CAiUiIdleIntegrationImpl ) : public CAiUiIdleIntegration
     {
-public: // constructor and destructor
+public: 
+    // constructor and destructor
     
     static CAiUiIdleIntegrationImpl* NewL( CEikonEnv& aEikEnv,         
                 const TAiIdleKeySoundConfig& aKeySoundConfig,
@@ -40,49 +45,49 @@
 
     ~CAiUiIdleIntegrationImpl();
 
-public: // new functions
+public: 
+    // new functions
         
     void HandleWsEventL( const TWsEvent& aEvent, 
                          CCoeControl* aDestination );
 
-private: // constructors
+private: 
+    // constructors
     
     CAiUiIdleIntegrationImpl(CEikonEnv& aEikEnv,
                              MAiFwEventHandler* aAiFwEventHandler);
     void ConstructL(const TAiIdleKeySoundConfig& aKeySoundConfig);
 
-private: // new functions
+private: 
+    // new functions
     
     void ActivateUI();
     
     void SetCallBubbleIfNeededL();
     void ClearCallBubbleL();
            
-    static TInt HandleSystemStateChange( TAny *aPtr );
-    static TInt HandleUiStartupStateChange( TAny *aPtr );
     static TInt HandleCallEvent( TAny *aPtr );
     
-private: // data  
-
-    CEikonEnv& iEikEnv;  
-    CActiveIdleState* iActiveIdleState;
-    TBool iThisApplicationForeground;
-    TBool iIncallBubbleAllowed;
-    TInt iThisApplicationWgId;
-    TInt iEikonServerWgId;
-    CAknIncallBubble* iIncallBubble;
+private: 
+    // data  
 
     /**
-     * Observer for system state Publish&Subscribe key.
-     * Owned.
+     * EikonEnv
+     * Not owned
      */
-    MAiPSPropertyObserver* iSystemStateObserver;
-
+    CEikonEnv& iEikEnv;  
+    
     /**
-     * Observer for system state Publish&Subscribe key.
-     * Owned.
+     * Active idle state
+     * Owned
      */
-    MAiPSPropertyObserver* iUiStartupStateObserver;
+    CActiveIdleState* iActiveIdleState;
+        
+    /**
+     * Incall bubble
+     * Owned
+     */
+    CAknIncallBubble* iIncallBubble;
 
     /**
     * Observer telephony state
@@ -95,10 +100,10 @@
      */
     MAiFwEventHandler* iAiFwEventHandler;
     
-    TBool iSystemStateOk;
-    TBool iUiStartupPhaseOk;
+    TBool iForeground;
+    TBool iIncallBubbleAllowed;    
     };
 
-
 #endif // C_AIUIIDLEINTEGRATION_H
 
+// End of file