diff -r b023a8d2866a -r ea65f74e6de4 photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxmediaselectionpopup.h
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxmediaselectionpopup.h	Thu Jul 15 18:39:01 2010 +0300
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxmediaselectionpopup.h	Thu Aug 19 09:55:03 2010 +0300
@@ -164,7 +164,24 @@
 	void HandleListBoxEventL (CEikListBox *aListBox, TListBoxEvent aEventType) ;
 	void HandlePointerEventL(const TPointerEvent& aPointerEvent);
     };
-    
+
+/**
+ * CGlxSingleGraphicPopupMenuStyleList
+ * 
+ * Adds behaviour to CAknSingleGraphicPopupMenuStyleListBox:
+ * For 'Add Album', default functionality is performed.
+ * For Tags editor, If a static item or user-defined item is selected 
+ * then we show 'OK' & 'Cancel' as SoftKeys(SK). Otherwise 'Cancel' SK.
+ * If 'static Item' is selected, sends 'EnterKeyPressed' event to ListBox observer.  
+ */
+NONSHARABLE_CLASS( CGlxSingleGraphicPopupMenuStyleListBox )
+   : public CAknSingleGraphicPopupMenuStyleListBox 					
+    {
+public:
+	/** See @ref CCoeControl::OfferKeyEventL */
+    TKeyResponse OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType); 
+    };
+
 /**
  * CGlxMediaSelectionPopup 
  *