--- a/phoneapp/phoneuicontrol/inc/cphoneuicontroller.h	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuicontrol/inc/cphoneuicontroller.h	Wed Sep 01 12:30:10 2010 +0100
@@ -38,7 +38,9 @@
 class CPhoneStateHandle;
 class CPEPhoneModel;
 class CPhoneRemoteControlHandler;
-
+class CPhoneKeyEventForwarder;
+class CPhoneSecurityModeObserver;
+class CPhoneViewController;
 
 class CPhoneUIController : 
     public CBase, 
@@ -52,8 +54,7 @@
         /**
         * Two-phased constructor.
         */
-        IMPORT_C static CPhoneUIController* NewL( 
-            MPhoneViewCommandHandle* aViewCommandHandle );
+        IMPORT_C static CPhoneUIController* NewL( CPhoneViewController& aViewCommandHandle );
         
         /**
         * Destructor.
@@ -84,6 +85,26 @@
             TEventCode aEventCode );
 
         /**
+        * From CAknAppUi, initialise a menupane (dynamic).
+        *
+        * @param aResourceId It is the resource id for the pane.
+        * @param aMenuPane It is the menu pane corresponding to the resource.
+        */
+        IMPORT_C void DynInitMenuPaneL( 
+            TInt aResourceId, 
+            CEikMenuPane* aMenuPane );
+
+        /**
+        * From CAknAppUi, initialise a menubar (dynamic).
+        *
+        * @param aResourceId It is the resource id for the bar.
+        * @param aMenuBar It is the menu bar corresponding to the resource.
+        */
+        IMPORT_C void DynInitMenuBarL( 
+            TInt aResourceId, 
+            CEikMenuBar* aMenuBar );
+
+        /**
         * From CEikAppUi. For Idle indicator
         */
         IMPORT_C void HandleSystemEventL(
@@ -138,12 +159,6 @@
         */
         IMPORT_C TBool ProcessCommandL( TInt aCommand );
 
-        /**
-        * Handles keylock events
-        * @param aCommand It is the code of the command to be handled.
-        */
-        IMPORT_C void HandleKeyLockEnabled( TBool aKeylockEnabled );
-        
     private:
         
         /**
@@ -154,12 +169,12 @@
         /**
         * By default EPOC constructor is private.
         */
-        void ConstructL( MPhoneViewCommandHandle* aViewCommandHandle );
+        void ConstructL( CPhoneViewController& aController );
         
         /**
         * Creates correct protocol DLL depending of the variation.
         */
-        void CreateProtocolDllL( MPhoneViewCommandHandle* aViewCommandHandle );
+        void CreateProtocolDllL( CPhoneViewController& aController );
         /**
         * CallBack for Phone Number Editor
         */
@@ -170,6 +185,11 @@
         */
         void DoHandlePhoneNumberEditorCallBack();
         
+		/**
+        * Handles the construction of Remote Controller Handler.
+        */
+        void ConstructRemoteControlHandlerL();
+        
     private:    // Data
 
         /**
@@ -212,6 +232,17 @@
         */
         MPhoneStateMachine* iStateMachine;  // NOT OWNED
         
+        /**
+        * iKeyEventForwarder
+        */
+        CPhoneKeyEventForwarder* iKeyEventForwarder;
+
+		/**
+		 * Security mode observer.
+		 * Own.
+		 */
+		CPhoneSecurityModeObserver* iSecurityModeObserver;
+		
     };
 
 #endif      // CPHONEUICONTROLLER_H