diff -r 792dfc98fb3b -r 8c55c525d5d7 camerauis/cameraapp/generic/inc/CamCaptureSetupViewBase.h
--- a/camerauis/cameraapp/generic/inc/CamCaptureSetupViewBase.h	Fri Mar 12 15:41:04 2010 +0200
+++ b/camerauis/cameraapp/generic/inc/CamCaptureSetupViewBase.h	Mon Mar 15 12:39:00 2010 +0200
@@ -114,7 +114,7 @@
           * Sets the iInfoListBoxActive flag
           * @param aActive What to set iInfoListBoxActive to
           */
-        void SetInfoListBoxMode(TBool aActive);        
+        void SetInfoListBoxMode(TBool aActive, TBool aFullySkinned=EFalse);        
         
          /**
           * Sets the iCaptureSetupModeActive flag
@@ -152,7 +152,7 @@
         * @param aSetupCommand The command that initiated capture setup mode, used to 
         *                        determine the required control type
         */
-        virtual void SwitchToCaptureSetupModeL(  TInt aSetupCommand );
+        virtual void SwitchToCaptureSetupModeL( TInt aSetupCommand, TBool aFullScreenVF=ETrue );
 
         /**
         * Exit capture setup mode.
@@ -190,7 +190,7 @@
         * @param aMode
         * @since 3.0
         */
-        virtual void SwitchToInfoListBoxL( TCamInfoListBoxMode aMode );        
+        virtual void SwitchToInfoListBoxL( TCamInfoListBoxMode aMode, TBool aFullySkinned=EFalse );        
 
         /**
         * Handle InfoListBox item selection
@@ -221,6 +221,7 @@
         */
         void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
 
+        void CaptureSetupModeSelection();
     private:
 
         /**
@@ -280,6 +281,7 @@
         // Purpose of current instance of iInfoListBoxContainer
         TCamInfoListBoxMode iInfoListBoxMode;                
         
+        TBool iForceAvkonCBA;
     private:   // data
 
         // Handler for the capture setup control