--- a/securitydialogs/Autolock/inc/AutolockGripStatusObserver.h	Wed Jun 09 10:38:11 2010 +0300
+++ b/securitydialogs/Autolock/inc/AutolockGripStatusObserver.h	Mon Jun 21 16:38:39 2010 +0300
@@ -24,36 +24,24 @@
 #include <w32std.h>
 #include <hwrmdomainpskeys.h>
 
-//CONSTANTS
-const TInt KCancelKeyCode( 165 );
-
-class MAutolockGripStatusObserver
-    {
-    public:
-        /**
-         * Implement this method to be notified when grip status
-         * changes.
-         */
-        IMPORT_C virtual TInt DeviceLockQueryStatus() = 0;
-        IMPORT_C virtual TInt DeviceLockStatus() = 0;
-    };
+class MAutolockAppUiInterface;
 
 class CAutolockGripStatusObserver : public CActive
     {
     public:
-        IMPORT_C static CAutolockGripStatusObserver* NewL( MAutolockGripStatusObserver* aObserver, RWsSession& aSession );
+        IMPORT_C static CAutolockGripStatusObserver* NewL( MAutolockAppUiInterface* aObserver, RWsSession& aSession );
 
         void RunL();
         void DoCancel();
         ~CAutolockGripStatusObserver();
     
     private:
-        void ConstructL( MAutolockGripStatusObserver* aObserver );   
+        void ConstructL( MAutolockAppUiInterface* aObserver );   
         CAutolockGripStatusObserver( RWsSession& aSession );
         void GripStatusChangedL( TInt aGripStatus );
 
     private:
-        MAutolockGripStatusObserver* iObserver;
+        MAutolockAppUiInterface* iObserver;
         RProperty iGripStatus;
         RWsSession& iSession;
     };