diff -r 10852b179f64 -r ea98413ce11f supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h	Wed Sep 15 12:40:28 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h	Wed Oct 13 15:01:35 2010 +0300
@@ -95,13 +95,15 @@
 
 class COMASuplSession : public CSuplSessionBase,
 						public MOMASuplConnObserver,
+                        public MOMASuplUICompletionObserver,
 						public MCompleteSelfRequest,
 						public MOMASuplMsgStateObserver,
 						public MOMASuplObserver,
 						public MOMASuplPrivacyObserver,
 						public MOMASuplTimeOutNotifier,
                         public MOMASuplEtelCompletionObserver,
-                        public MOMASuplIapChangeNotifierObserver
+                        public MOMASuplIapChangeNotifierObserver,
+                        public MOMASuplDialogTimeOutNotifier
 {
 
   public:  // Constructors and destructor
@@ -207,6 +209,27 @@
 	        */
 			void GetPositionComplete(TInt aError);
 			
+        	/** 
+            * This callback method is used to notify the client about 
+            * the completion of UI launch
+            * @param aError - Error during Launch
+            * @return None
+            */
+        	void SettingsUICompletedL(TInt aError);
+		
+            /** 
+            * This callback method is used to notify the client about 
+            * the completion of UI
+            * @return None
+            */
+			void SettingsUsageUICompletedL(TInt aError);
+			
+            /** 
+            * This callback method is used to notify the client about 
+            * the completion of UI 
+            * @return None
+            */
+			void SettingsTimeOutUICompletedL(TInt aError);
 			
 	public: 			 
 			/**
@@ -232,14 +255,10 @@
 			* @param aAllowedCapabilities, Capabilities of SET
 			* @param aSessionIdSeed, seed value of session
 			* @param aRequestID, Request Identification number.
-			* @param aIsStaleCellId, indicates if this session is for a stale cell id conversion
-			* @param aLocationId , contains cell id parameters for which position is to be retrieved,ownership is transferred to this object
-			* @param aPrompt indicates if the user is to be prompted when making location requests
-			* @param aWlanOnly ,request to connect server using wlan connection only using OCC Api's
 			* @return None
 			*/
 			virtual void RunSuplSessionL(TRequestStatus& aStatus, TBool aFirstReq, const TDesC& aHslpAddress, TBool aFallBack, TInt aAllowedCapabilities, 
-										 TInt aSessionIdSeed, TInt aRequestID = 0,TBool aIsStaleCellId = EFalse,COMASuplLocationId* aLocationId = NULL,TBool aPrompt = EFalse,TBool aWlanOnly = EFalse);
+										 TInt aSessionIdSeed, TInt aRequestID = 0);
 										 
 			/**
 			* RunSessionL, Starts the SUPL Sesssion for Terminal Initiated Location Request
@@ -906,7 +925,13 @@
 			*/
 			virtual void TimerExpiredL();
             
-			
+			/**
+			* Dialog Timeout Notifier Method.
+			* @since Series 60 9.1 TB
+			* @param None
+			* @return None
+			*/
+            virtual void DialogTimerExpiredL();
     public:  // Usage dialog
             void SetSuplUsageFlag();
             void ReSetSuplUsageFlag();
@@ -914,7 +939,6 @@
             void StartUsageDialogLaunchL();
             TBool IsEtelNotifySet();
             TBool IsEtelRoamingSet();
-            TBool HasMeLaunchedUsageDialog();
 			TUint GetPortNumUsed();
 	 private:
 	 
@@ -1061,7 +1085,8 @@
 			
 			//Timeout Timer
 			COMASuplTimeoutTimer* iTimer;
-	
+
+			COMASuplDialogTimer* iDialogTimer;
             //Roaming indicator
             TBool iRoaming;
 
@@ -1110,20 +1135,9 @@
             
             COMASuplAsnHandlerBase* iOMASuplAsnHandlerBaseImpl; 
             
-            // Network privacy handle.Ownership is with this object
             CPosNetworkPrivacy* iNetworkPrivacy;
-            //Stale cell id which for which position is to be retrieved.Ownership is with this object
-            COMASuplLocationId* iStaleLocationId;
-			//indicates if this session is for a stale cell id conversion
-            TBool   iIsStaleLocIdPresent;
-			//indicates if the user needs to be prompted when making a location request
-            TBool   iStaleLocIdPrompt;
-            TBool iIhaveLaunchedUsagedialog;
 
             TUint iPortNum;
-            
-            //To indicate WLAN connection for OCC
-            TBool iWlanOnly; 
     };
 
 #endif      // C_COMASUPLSESSION_H