diff -r ff572dfe6d86 -r 9674c1a575e9 idlehomescreen/xmluirendering/uiengine/inc/xnviewadapter.h --- a/idlehomescreen/xmluirendering/uiengine/inc/xnviewadapter.h Fri Mar 12 15:41:49 2010 +0200 +++ b/idlehomescreen/xmluirendering/uiengine/inc/xnviewadapter.h Mon Mar 15 12:39:47 2010 +0200 @@ -32,7 +32,6 @@ class CXnAppUiAdapter; class CXnControlAdapter; class CXnKeyEventDispatcher; -class CXnBgControl; class CXnBackgroundManager; class CXnFocusControl; @@ -88,14 +87,6 @@ CXnKeyEventDispatcher* EventDispatcher() const; /** - * Gets bg control - * - * @since S60 5.0 - * return Bg control - */ - CCoeControl& BgControl() const; - - /** * Gets background manager * * @since S60 5.0 @@ -112,11 +103,11 @@ CXnFocusControl& FocusControl() const; /** - * updates rsk by mode + * updates rsk by UI state * * @since S60 5.0 */ - void UpdateRskByModeL(); + void UpdateRskByUiStateL( const CXnViewData& aViewData ); /** * Closes all popups for this container. @@ -168,7 +159,7 @@ */ void NotifyInCallStateChaged( TBool aInCall ); -private: +public: // new functions /** @@ -180,6 +171,9 @@ */ void ChangeControlsStateL( TBool aAwake ); +private: + // new functions + /** * Activates new container ro view. * Deactivates internally previous container if it exists. @@ -239,8 +233,6 @@ /** AppUi, Not owned */ CXnAppUiAdapter& iAppUiAdapter; - /** Bg control, Owned */ - CXnBgControl* iBgControl; /** Background manager, Owned */ CXnBackgroundManager* iBgManager; /** Focus control, Owned */