--- a/taskswitcher/taskswitcherui/taskswitcherapp/inc/tsfastswapgrid.h	Wed Sep 01 12:32:46 2010 +0100
+++ b/taskswitcher/taskswitcherui/taskswitcherapp/inc/tsfastswapgrid.h	Tue Sep 14 20:58:58 2010 +0300
@@ -22,9 +22,9 @@
 #include <AknGrid.h>
 #include <aknconsts.h>
 #include "tsdevicestate.h"
+#include "tsfastswapareautils.h"
 
 class CAknsFrameBackgroundControlContext;
-class CTsFastSwapTimer;
 
 /**
  * Observer for handling fast swap grid events
@@ -42,16 +42,6 @@
     };
 
 
-class MTsFastSwapTimerObserver
-    {
-public:
-    /**
-     * Called when timer is completed
-     */
-    virtual void TimerCompletedL( CTsFastSwapTimer* aSource ) = 0;
-    };
-
-
 /**
  * Avkon grid implementing custom item drawer
  */
@@ -375,25 +365,4 @@
     };
 
 
-
-/**
- * Timer class for handling highlight bevaiour
- */
-class CTsFastSwapTimer : public CTimer
-    {
-public:
-    // Constructor
-    CTsFastSwapTimer( MTsFastSwapTimerObserver& aObserver );
-    // Destructor
-    ~CTsFastSwapTimer();
-    // 2nd phase constructor
-    void ConstructL();
-    
-private: // From CTimer
-    void RunL();
-    
-private: // Data
-    MTsFastSwapTimerObserver* iObserver; // not own
-    };
-
 #endif /* TSFASTSWAPGRID_H_ */