diff -r 000000000000 -r 1e05558e2206 usbengines/usbwatcher/inc/cusbwatchersession.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbengines/usbwatcher/inc/cusbwatchersession.h	Thu Dec 17 09:14:30 2009 +0200
@@ -0,0 +1,92 @@
+/*
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Session class for USB Watcher
+*
+*/
+
+
+#ifndef CUSBWATCHERSESSION_H
+#define CUSBWATCHERSESSION_H
+
+#include <e32std.h>
+#include <e32base.h>
+#include "musbwatchernotify.h"
+//
+// Forward declarations
+//
+class CUsbWatcherServer;
+class CUsbWatcher;
+
+NONSHARABLE_CLASS( CUsbWatcherSession ) : public CSession2,
+    public MUsbWatcherNotify
+    {
+public:
+    static CUsbWatcherSession* NewL(CUsbWatcherServer* aServer);
+    virtual ~CUsbWatcherSession();
+
+    // CSession
+    virtual void ServiceL(const RMessage2& aMessage);
+        
+    virtual void Notify(TInt iPersonalityId, TInt aStatus); 
+
+    /**
+     * Check if ask on connection mode query is suppressed in this session.
+     * From MUsbWatcherNotify
+     */
+    virtual TBool IsAskOnConnectionSuppressed();
+    
+protected:
+    CUsbWatcherSession(CUsbWatcherServer* aServer);
+    void ConstructL();
+
+    void DispatchMessageL(const RMessage2& aMessage);
+
+private:
+
+    TInt SetPersonality(const RMessage2& aMessage, TBool& aComplete);
+    TInt CancelSetPersonality(const RMessage2& aMessage, 
+            TBool& aComplete);
+    TInt SetPreviousPersonality(const RMessage2& aMessage,
+            TBool& aComplete);
+    TInt SetPreviousPersonalitySync(const RMessage2& aMessage, 
+            TBool& aComplete);    
+    TInt CancelSetPreviousPersonality(const RMessage2& aMessage, 
+            TBool& aComplete);
+    TInt SetPreviousPersonalityOnDisconnect(const RMessage2& aMessage, 
+            TBool& aComplete);
+
+    /**
+     * Prevent showing ask on connection mode query in this session.
+     * This affects to the next cable connections. The currently shown
+     * mode query is not closed.
+     * aSuppress ETrue prevents showing the mode query.
+     */
+    void SetAskOnConnectionSuppression(TBool aSuppress);
+
+    CUsbWatcherServer* iUsbWatcherServer;
+    RMessage2 iSetPersonalityMessage;
+    RMessage2 iCancelSetPersonalityMessage;
+    RMessage2 iSetPreviousPersonalityMessage;
+    RMessage2 iCancelSetPreviousPersonalityMessage;
+    TBool iSetPersonalityOutstanding;
+    TBool iCancelSetPersonalityOutstanding;
+
+    TBool iSetPreviousPersonalityOutstanding;
+    TBool iCancelSetPreviousPersonalityOutstanding;
+    TBool iSuppressAskOnConnection; // Prevent ask on connection mode query 
+    };
+
+#endif
+
+// End of file