diff -r 4e8ebe173323 -r 23b5d6a29cce homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h
--- a/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h	Mon May 03 12:24:59 2010 +0300
+++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/inc/hsinstalledappsstate.h	Fri May 14 15:43:04 2010 +0300
@@ -20,9 +20,11 @@
 
 #include <qstate.h>
 #include <QModelIndex>
+#include <QPointer>
 
 #include "hsmenustates_global.h"
 #include "hsmenuservice.h"
+#include "hsmenuview.h"
 
 HS_STATES_TEST_CLASS(MenuStatesTest)
 
@@ -31,19 +33,9 @@
 class HbMenu;
 class HbAbstractViewItem;
 class QPointF;
-class HsMenuView;
+class HsMenuViewBuilder;
 class HsMenuItemModel;
-/**
- * @ingroup group_hsmenustateplugin
- * @brief All Applications State.
- *
- * Displays all installed packages present on the device.
- *
- * @see StateMachine
- *
- * @lib ?library
- * @since S60 ?S60_version
- */
+
 class HsInstalledAppsState: public QState
 {
     Q_OBJECT
@@ -52,7 +44,8 @@
 
 public:
 
-    HsInstalledAppsState(HsMenuView &menuView, QState *parent = 0);
+    HsInstalledAppsState(HsMenuViewBuilder &menuViewBuilder,
+                         QState *parent = 0);
 
     ~HsInstalledAppsState();
 
@@ -71,6 +64,8 @@
 
     void stateExited();
 
+	void contextMenuAction(HbAction *action);
+
 private:
 
     void construct();
@@ -78,12 +73,11 @@
     void setMenuOptions();
 
 private:
-
     /**
      * The View widget.
      * Own.
      */
-    HsMenuView &mMenuView;
+    HsMenuView mMenuView;
 
     /**
      * Item Model for the List.
@@ -96,14 +90,10 @@
      * Backstepping functionality.
      * Own.
      */
-    HbAction *mSecondarySoftkeyAction;
+    HbAction *const mSecondarySoftkeyAction;
 
-    /**
-     * Old navigation icon.
-     * Not own.
-     */
-    HbAction *mOldNavigationAction;
-
+	QModelIndex mContextModelIndex;
+	QPointer<HbMenu> mContextMenu;
 };
 
 #endif // HSINSTALLEDAPPSSTATE_H