MCL/sf/mw/homescreensrv: comparison homescreensrv_plat/idlefw

equal deleted inserted replaced

-:1a2a00e78665
+:d0529222e3f0
 * Description:  UI controller API
 *
 */
-#ifndef C_AIUICONTROLLER_H
+#ifndef _AIUICONTROLLER_H
-#define C_AIUICONTROLLER_H
+#define _AIUICONTROLLER_H
+// System includes
 #include <ecom/ecom.h>
+// User includes
 #include "aicontentmodel.h"
-#include "aifwdefs.h"
 #include "aiuicontrolleruid.hrh"
 #include "aipluginsettings.h"
+// Forward declarations
 class MAiContentObserver;
 class MAiFwEventHandler;
-class MAiUiFrameworkObserver;
+class MAiFwStateHandler;
-class CCoeEnv;
-class CAiContentPublisher;
 class MAiMainUiController;
 class MAiSecondaryUiController;
+class THsPublisherInfo;
+class CCoeEnv;
 /**
 * ECom interface UID for CAiUiContoller
 */
 const TUid KInterfaceUidUiController = { AI_UID_ECOM_INTERFACE_UICONTROLLER };
 * @since Series 60 3.2
 */
 class CAiUiController : public CBase
 {
 public:
+// Constructors and destructor
-// Constructors and destructor
 /**
 * Static factory method.
 *
 * @since Series 60 3.2
 * @param ECom implementatoin uid
 * @return class instance
 */
-inline static CAiUiController* NewL(TUid aImpUid);
+inline static CAiUiController* NewL( TUid aImpUid );
 /**
 * Static factory method.
 *
 * @since Series 60 3.2
 * @param mimetype
 * @return class instance
 */
-inline static CAiUiController* NewL(const TDesC8& aMime);
+inline static CAiUiController* NewL( const TDesC8& aMime );
 /**
 * Destructor.
 */
-inline virtual ~CAiUiController();
+inline ~CAiUiController();
-// New functions
+public:
+// New functions
 /**
 * Instructs this UI controller to load its UI definition.
 *
 * @since Series 60 3.2
 */
 virtual void LoadUIDefinitionL() = 0;
 /**
-* Retrieves the Content Publisher Plug-in list defined in this UI
-* controller's UI model.
-*
-* @since Series 60 3.2
-*/
-virtual void GetPluginsL(RAiPublisherInfoArray& aPlugins) = 0;
-/**
 * Retrieves plug-in settings specified in this UI controller's UI definition.
 *
-* @param aPubInfo      Publisher info of the plug-in for which to
+* @param aPublisherInfo Publisher info of the plug-in for which to
-*                      retrieve settings for.
+*                       retrieve settings for.
 * @param aSettings array to get settings items to.
 */
-virtual void GetSettingsL(const TAiPublisherInfo& aPubInfo,
+virtual void GetSettingsL(
-							RAiSettingsItemArray& aSettings) = 0;
+const THsPublisherInfo& aPublisherInfo,
+RAiSettingsItemArray& aSettings ) = 0;
 /**
 * Activate UI managed by this UI controller.
 *
 * @since Series 60 3.2
 * @since Series 60 3.2
 * @param aEventHandler Framework event handler for this UI controller.
 *                      Set to NULL to disable event callbacks from this
 *                      UI Controller.
 */
-virtual void SetEventHandler(MAiFwEventHandler& aEventHandler) = 0;
+virtual void SetEventHandler( MAiFwEventHandler& aEventHandler ) = 0;
 /**
-* Remove specified plugin from the UI.
+* Sets plugin state handler
 *
-* @param aPlugin plugin that is removed.
+* @since S60 5.2
-*/
+* @param aHandler Plugin State Handler
-virtual void RemovePluginFromUI( MAiPropertyExtension& aPlugin ) = 0;
+*/
+virtual void SetStateHandler( MAiFwStateHandler& aStateHandler ) = 0;
 /**
 * Returns the main UI Controller interface, or NULL if this is not the
 * main UI controller.
 */
 virtual MAiMainUiController* MainInterface() = 0;
 * Returns the secondary UI Controller interface, or NULL if this is not
 * a secondary UI controller.
 */
 virtual MAiSecondaryUiController* SecondaryInterface() = 0;
-private:     // Data
+private:
+// data
-TUid iDestructKey; // An identifier used during destruction
+/** An identifier used during destruction */
+TUid iDestructKey;
 };
-inline CAiUiController* CAiUiController::NewL(TUid aImplUid)
+// ----------------------------------------------------------------------------
-{
+// CAiUiController::NewL
-TAny* ptr = REComSession::CreateImplementationL(aImplUid,
+//
-_FOFF(CAiUiController, iDestructKey));
+// ----------------------------------------------------------------------------
+//
-return reinterpret_cast<CAiUiController*> (ptr);
+inline CAiUiController* CAiUiController::NewL( TUid aImplUid )
+{
+TAny* ptr = REComSession::CreateImplementationL( aImplUid,
+_FOFF( CAiUiController, iDestructKey ) );
+return reinterpret_cast< CAiUiController* >( ptr );
 }
-inline CAiUiController* CAiUiController::NewL(const TDesC8& aMime)
+// ----------------------------------------------------------------------------
+// CAiUiController::NewL
+//
+// ----------------------------------------------------------------------------
+//
+inline CAiUiController* CAiUiController::NewL( const TDesC8& aMime )
 {
 TEComResolverParams params;
-params.SetDataType(aMime);
+params.SetDataType( aMime );
-TAny* ptr = REComSession::CreateImplementationL(KInterfaceUidUiController,
+TAny* ptr = REComSession::CreateImplementationL( KInterfaceUidUiController,
-_FOFF(CAiUiController, iDestructKey), params);
+_FOFF( CAiUiController, iDestructKey ), params );
-return reinterpret_cast<CAiUiController*> (ptr);
+return reinterpret_cast< CAiUiController* >( ptr );
 }
+// ----------------------------------------------------------------------------
+// CAiUiController::~CAiUiController
+//
+// ----------------------------------------------------------------------------
+//
 inline CAiUiController::~CAiUiController()
 {
-REComSession::DestroyedImplementation(iDestructKey);
+REComSession::DestroyedImplementation( iDestructKey );
 }
 /**
 * Main UI Controller interface for Active Idle.
 * @since S60 3.2
 */
 class MAiMainUiController
 {
 public:
+// new functions
 /**
 * Starts application framework and application event loop.
 * This function returns only when the application is shut down.
 *
 * @exception Any of the system-wide error codes in case application
 /**
 * Returns the CONE environment object this main UI controller uses.
 */
 virtual CCoeEnv& CoeEnv() = 0;
-/**
-* Sets UI framework observer for this main UI controller.
-*/
-virtual void SetUiFrameworkObserver( MAiUiFrameworkObserver& aObserver ) = 0;
 /**
 * Exits the main ui controller
 **/
 virtual void Exit() = 0;
 * @since S60 3.2
 */
 class MAiSecondaryUiController
 {
 public:
+// new functions
 /**
 * Sets the CONE environment object for this secondary UI controller to use.
 *
 * @param aCoeEnv the CONE environment object to use.
 */
 virtual void SetCoeEnv( CCoeEnv& aCoeEnv ) = 0;
-/**
-* Returns the UI framework observer of this secondary UI controller.
-*
-* @return The UI framework observer, or NULL if observer is not supported.
-*/
-virtual MAiUiFrameworkObserver* UiFrameworkObserver() = 0;
 };
-#endif // C_AIUICONTROLLER_H
+#endif // _AIUICONTROLLER_H
 // End of File.

branch	RCL_3
changeset 8	d0529222e3f0
parent 0	79c6a41cd166