diff -r 792dfc98fb3b -r 8c55c525d5d7 camerauis/cameraapp/generic/inc/CamCaptureSetupContainer.h
--- a/camerauis/cameraapp/generic/inc/CamCaptureSetupContainer.h	Fri Mar 12 15:41:04 2010 +0200
+++ b/camerauis/cameraapp/generic/inc/CamCaptureSetupContainer.h	Mon Mar 15 12:39:00 2010 +0200
@@ -56,7 +56,8 @@
               CCamAppController&              aController, 
               CAknView&                       aView,
               CCamCaptureSetupControlHandler& aControlHandler,
-              const TRect&                    aRect  );
+              const TRect&                    aRect,
+              TBool aFullScreenVF=ETrue );
         
     /**
     * Destructor.
@@ -152,11 +153,6 @@
     */
     TRect TouchLayout();
     
-    /**
-    * Enters viewfinder mode either in image or videomode
-    * depending current visible view. Also starts idle timer.
-    */
-    void ReserveAndStartVF();
     
   // -----------------------------------------------------
   // Constructors
@@ -172,7 +168,8 @@
     CCamCaptureSetupContainer( 
         CCamAppController& aController,
         CAknView& aView,
-        CCamCaptureSetupControlHandler& aControlHandler );
+        CCamCaptureSetupControlHandler& aControlHandler,
+        TBool aFullScreenVF = ETrue );
 
     /**
     * Symbian OS 2nd phase constructor.
@@ -207,6 +204,8 @@
     TInt iListBoxWidth;
     
     TBool iActivateOnTouchRelease;
+
+    TBool iFullScreenVF;
     MTouchFeedback* iFeedback; // not own
     TRect iLayoutAreaRect; 
   };