Modified SetFrame

Change-Id: I7eba75db936e93e1de7a70cd4da5d723a4012c33
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/inc/FShellLiveboxPopupProvider.h b/inc/FShellLiveboxPopupProvider.h
index d46977b..4179749 100644 (file)
--- a/inc/FShellLiveboxPopupProvider.h
+++ b/inc/FShellLiveboxPopupProvider.h
@@ -162,7 +162,7 @@ protected:
        virtual void LiveboxPopupProvider_Reserved3(void) {}
 
 private:
-       Tizen::Shell::LiveboxPopup*   __pLiveboxFrame;//Todo to impl
+       Tizen::Shell::LiveboxPopup*   __pLiveboxPopup;//Todo to impl
        class _LiveboxProviderImpl* __pLiveboxProviderImpl;
 
        friend class _LiveboxManagerImpl;

diff --git a/src/FShellLiveboxPopupProvider.cpp b/src/FShellLiveboxPopupProvider.cpp
index 8bcb638..9c3acbe 100644 (file)
--- a/src/FShellLiveboxPopupProvider.cpp
+++ b/src/FShellLiveboxPopupProvider.cpp
@@ -21,6 +21,7 @@
 
 #include "FShell_LiveboxProviderImpl.h"
 #include "FShellLiveboxPopupProvider.h"
+#include "FShell_LiveboxPopupImpl.h"
 
 namespace Tizen { namespace Shell
 {
@@ -56,16 +57,22 @@ LiveboxPopupProvider::GetId() const
 }
 
 void
-LiveboxPopupProvider::SetLiveboxPopup(LiveboxPopup* pLiveboxFrame)
+LiveboxPopupProvider::SetLiveboxPopup(LiveboxPopup* pLiveboxPopup)
 {
-       __pLiveboxFrame = pLiveboxFrame;
-//     return __pLiveboxProviderImpl->SetLiveboxFrame(pLiveboxFrame);
+       __pLiveboxPopup = pLiveboxPopup;
+
+       _LiveboxPopupImpl* pLiveboxPopupImpl = _LiveboxPopupImpl::GetInstance(*pLiveboxPopup);
+       SysAssertf(pLiveboxPopupImpl != null, "Not-yet constructed! Construct() should be called before use.");
+
+       pLiveboxPopupImpl->SetProviderId(GetId());
+
+//     return __pLiveboxProviderImpl->SetLiveboxFrame(pLiveboxPopup);
 }
 
 LiveboxPopup*
 LiveboxPopupProvider::GetLiveboxPopup() const
 {
-       return __pLiveboxFrame;
+       return __pLiveboxPopup;
 //     return __pLiveboxProviderImpl->GetLiveboxFrame();
 }
 

diff --git a/src/FShell_LiveboxProviderImpl.cpp b/src/FShell_LiveboxProviderImpl.cpp
index 951f304..cbca71b 100644 (file)
--- a/src/FShell_LiveboxProviderImpl.cpp
+++ b/src/FShell_LiveboxProviderImpl.cpp
@@ -20,6 +20,7 @@
 
 //#include <FShellLiveboxProvider.h>
 #include "FShell_LiveboxProviderImpl.h"
+#include "FShell_LiveboxFrameImpl.h"
 
 namespace Tizen { namespace Shell
 {
@@ -48,6 +49,12 @@ result
 _LiveboxProviderImpl::SetLiveboxFrame(LiveboxFrame* pLiveboxFrame)
 {
        __pLiveboxFrame = pLiveboxFrame;
+
+       _LiveboxFrameImpl* pLiveboxFrameImpl = _LiveboxFrameImpl::GetInstance(*pLiveboxFrame);
+       SysAssertf(pLiveboxFrameImpl != null, "Not-yet constructed! Construct() should be called before use.");
+
+       pLiveboxFrameImpl->SetProviderId(GetId());
+
        return E_SUCCESS;
 }