diff -r b01126ce0bec -r ba63c83f4716 taskswitcher/taskswitcherui/taskswitcherapp/inc/tsfastswapgrid.h
--- a/taskswitcher/taskswitcherui/taskswitcherapp/inc/tsfastswapgrid.h	Wed Sep 15 12:00:00 2010 +0300
+++ b/taskswitcher/taskswitcherui/taskswitcherapp/inc/tsfastswapgrid.h	Wed Oct 13 14:18:30 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,6 +42,16 @@
     };
 
 
+class MTsFastSwapTimerObserver
+    {
+public:
+    /**
+     * Called when timer is completed
+     */
+    virtual void TimerCompletedL( CTsFastSwapTimer* aSource ) = 0;
+    };
+
+
 /**
  * Avkon grid implementing custom item drawer
  */
@@ -365,4 +375,25 @@
     };
 
 
+
+/**
+ * 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_ */