diff -r 5b238bc8ffb6 -r 01504893d9cb photosgallery/slideshow/view/inc/shwslideshowview.h --- a/photosgallery/slideshow/view/inc/shwslideshowview.h Wed Sep 15 12:13:06 2010 +0300 +++ b/photosgallery/slideshow/view/inc/shwslideshowview.h Wed Oct 13 14:32:09 2010 +0300 @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include "shwengineobserver.h" @@ -74,8 +73,7 @@ public MShwGestureObserver, public MStorageNotifierObserver, public MGlxTvObserver, - public MGlxHDMIDecoderObserver, - public MAknWsEventObserver + public MGlxHDMIDecoderObserver { public: @@ -141,9 +139,6 @@ */ void HandleForegroundEventL(TBool aForeground); - public: // From MAknWsEventObserver - void HandleWsEventL(const TWsEvent& aEvent, CCoeControl* aDestination); - public: // From CGlxViewBase /** @@ -346,11 +341,6 @@ * for which HDMI advance decoding will be done */ TInt GetNextIndex(); - /** - * Returns the application foreground status. - * Foreground status is found using WindowsGroupID - */ - TBool IsAppInForegroundL(); public: //to keep in track which of the command set is active/on top enum TShwState @@ -435,6 +425,7 @@ TShwState iShwState; TShwFurniture iShwFurniture; + TInt iCurrentActiveCommandSet; CShwGestureControl* iShwGestureControl; GestureHelper::CGestureControl* iGestureControl; CAlfControlGroup* iGestureControlGroup; @@ -453,7 +444,6 @@ TInt iHdmiWidth; TInt iHdmiHeight; - CAknWsEventMonitor* iAknEventMonitor;// not owned }; #endif // C_SHWSLIDESHOWVIEW_H