diff -r 1ddebce53859 -r f5ec9446e5bf camerauis/cameraapp/generic/inc/CamAppController.h
--- a/camerauis/cameraapp/generic/inc/CamAppController.h	Thu Jan 07 16:18:56 2010 +0200
+++ b/camerauis/cameraapp/generic/inc/CamAppController.h	Mon Jan 18 20:06:55 2010 +0200
@@ -22,7 +22,6 @@
 // ===========================================================================
 //  INCLUDES
 #include <e32base.h>
-#include <ProductVariant.hrh>
 
 #include <cflistener.h> // publish zoom state related
 #include <cfclient.h>
@@ -106,7 +105,7 @@
 class CCamGSInterface;
 class CCameraUiConfigManager;
 class CCamPropertyWatcher;
-
+class CCamSnapShotRotator;
 
 
 class CCamFlashStatus;
@@ -2192,6 +2191,11 @@
          */
         TBool VideoInitNeeded();
         
+        /**
+         * Stores the UserScene settings
+         */
+        void StoreUserSceneSettingsL();
+        
   private:
 
     // -----------------------------------------------------
@@ -2560,10 +2564,11 @@
     TBool iDeepSleepTimerExpired;
     // not owned by camappcontroller
     CCameraUiConfigManager* iConfigManager;
-    TBool iVideoInitNeeded; // Used to decide if the need to call CAE video init //PS
+    TBool iVideoInitNeeded; // Used to decide if the need to call CAE video init
     CCamSyncRotatorAo* iRotatorAo;
     CFbsBitmap* iRotatedSnapshot;
     CCamBurstCaptureArray* iRotationArray;
+    CCamSnapShotRotator* iSnapShotRotator;
     // orientation at capture time
     TCamImageOrientation  iCaptureOrientation;