diff -r 8a27654f7b62 -r 20fda83a6398 bluetooth/btstack/linkmgr/physicallinks.h
--- a/bluetooth/btstack/linkmgr/physicallinks.h	Fri Mar 12 15:49:00 2010 +0200
+++ b/bluetooth/btstack/linkmgr/physicallinks.h	Mon Mar 15 12:44:59 2010 +0200
@@ -444,10 +444,21 @@
 	void DeletePasskeyEntry();
 	void CancelPasskeyEntry();
 	void PasskeyEntryKeyPressed(THCIPasskeyEntryNotificationType aKey);
+
+	void NewUserConfirmerL(const TBTDevAddr aAddr,CBTSecMan& aSecMan,TBool aInternallyInitiated);
+
+	CBTUserConfirmer* InstanceUserConfirmer() const;
+	TBool IsUserConfirmerActive()const;
+	void DeleteUserConfirmer();
+	void CancelUserConfirmer();
+
+	
 	TBasebandTime GetSniffInterval() const;
 	
 	TBool IsPairable() const;
 
+	TBool IsPairingExpected() const;
+	
 private:
 	CPhysicalLink(CPhysicalLinksManager& aParent, CRegistrySession& aRegSess, const TBTNamelessDevice& aDevice);
 	void ConstructL();
@@ -486,7 +497,7 @@
 	void PINCodeRequestNegativeReply(const TBTDevAddr& aDevAddr);
 	
 	inline TBool IsAuthenticationPending() const;
-
+	
 	void LinkKeyRequestResponseAttempt(TBool aForceResponse = EFalse);
 	void DoLinkKeyResponse(TBool aPositive);
 
@@ -519,6 +530,7 @@
 	CBTPinRequester*						iPinRequester;	// looks after PIN entry UI/state
 	CBTNumericComparator*					iNumericComparator; // looks after the numeric comparison UI/state
 	CBTPasskeyEntry*						iPasskeyEntry; // looks after the passkey entry UI/state
+	CBTUserConfirmer*					iUserConfirmer; // looks after the user confirmation UI/state
 	
 	CEncryptionEnforcer*					iEncryptionEnforcer;
 	
@@ -579,6 +591,8 @@
 	TBool						iNewPinCodeValid;
 	TBTPinCode					iNewPinCode;
 
+	TBool						iLinkKeyReturnedInThisAuthentication;
+	TBool						iLinkKeyObtainedThroughDedicatedBonding;
 private:
 	/**
 	Enumeration to represent the current state of the physical links storage in the registry,