--- a/photosgallery/viewframework/medialists/inc/glxcachemanager.h	Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/medialists/inc/glxcachemanager.h	Tue Feb 02 00:10:37 2010 +0200
@@ -53,9 +53,12 @@
  *
  *  @lib glxmedialists.lib
  */
-class CGlxCacheManager : public CBase, public MGlxCache, public MGlxMediaPool
+class CGlxCacheManager : public CBase, 
+                         public MGlxCache, 
+                         public MGlxMediaPool,
+                         public MImageReadyCallBack
 #ifdef USE_S60_TNM
-, public MThumbnailManagerObserver,public MImageReadyCallBack
+, public MThumbnailManagerObserver
 #endif
 	{
 public:
@@ -182,7 +185,8 @@
     void ForceCleanupMedia(TGlxIdSpaceId aSpaceId,TGlxMediaId aId); 
 
 public:
-    void ImageReadyL(const TInt& aError, const TSize aSz);
+    void ImageSizeReady(TInt aError, const TSize aSz);
+
 private:
     /**
      * Constructor
@@ -287,7 +291,22 @@
      */
     CMPXCollectionPath* RequestAsPathLC(const CGlxMediaList& aList);
     
+    /**
+     * Gets the mime type of a given file.
+     * @param aFileName The file name for which a MIME type to be determined
+     * @aMimeType The MIME type associated with the given file will be returned
+     */
     void GetMimeTypeL(TFileName& aFileName, TDataType& aMimeType );
+
+    /**
+     * Creates the image viewer instance, if not created already.
+     */    
+    void CreateImageViewerInstanceL();
+    
+    /**
+     * Deletes the image viewer instance, if created already.
+     */    
+    void DeleteImageViewerInstance();
     
 #ifdef USE_S60_TNM
     /*