[ACR][Add|Modify] change return value for OnXXXInitializing() for LiveboxProvider...

[ACR][Modify] Change size type Livebox API (int to floating point)

Change-Id: I4441ff8695808731028b9e0cf70681444e435ed8
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

diff --git a/inc/FShellILiveboxProviderFactory.h b/inc/FShellILiveboxProviderFactory.h
index f7c3fbf..a2bb21e 100644 (file)
--- a/inc/FShellILiveboxProviderFactory.h
+++ b/inc/FShellILiveboxProviderFactory.h
@@ -66,7 +66,7 @@ public:
         * @param[in]   height          The height of the Livebox
         * @param[in]   userInfo        User information that specifed when the Livebox is added
         */
-       virtual LiveboxProvider* CreateInstance(const Tizen::Base::String& providerName, int width, int height, const Tizen::Base::String& userInfo) = 0;
+       virtual LiveboxProvider* CreateInstance(const Tizen::Base::String& providerName, float width, float height, const Tizen::Base::String& userInfo) = 0;
 
 protected:
        //

diff --git a/inc/FShellLiveboxPopupProvider.h b/inc/FShellLiveboxPopupProvider.h
old mode 100644 (file)
new mode 100755 (executable)
index 5784368..b564855
--- a/inc/FShellLiveboxPopupProvider.h
+++ b/inc/FShellLiveboxPopupProvider.h
@@ -64,11 +64,13 @@ protected:
         * @since       2.1
         *
         * @param[in]   userInfo        User information that specifed when the Livebox is added
+        * @return      @c true if the method is successful, @n
+        *                              else @c false\r
         *
         * @remarks     LiveboxPopup should be created and set here
         * @see         SetLiveboxPopup
         */
-       virtual void OnLiveboxPopupProviderInitializing(const Tizen::Base::String& userInfo) = 0;
+       virtual bool OnLiveboxPopupProviderInitializing(const Tizen::Base::String& userInfo) = 0;
 
        /**
         * Called when the Livebox popup provider is required to be destroyed @n
@@ -109,7 +111,7 @@ protected:
         *
         * @return      The LiveboxPopup instnace, or null if any LiveboxPopup is set yet.
         */
-       const Tizen::Shell::LiveboxPopup* GetLiveboxPopup() const;
+       const Tizen::Shell::LiveboxPopup* GetLiveboxPopup(void) const;
 
        /**
         * Requests Livebox service to trigger specified Livebox update

diff --git a/inc/FShellLiveboxProvider.h b/inc/FShellLiveboxProvider.h
old mode 100644 (file)
new mode 100755 (executable)
index 222bfe4..fc37ea1
--- a/inc/FShellLiveboxProvider.h
+++ b/inc/FShellLiveboxProvider.h
@@ -68,6 +68,9 @@ protected:
         * @param[in]   height          The height of the Livebox
         * @param[in]   userInfo        User information that specifed when the Livebox is added
         *
+        * @return      @c true if the method is successful, @n
+        *              else @c false
+        *
         * @remarks     LiveboxFrame should be created and set here
         * @see         SetLiveboxFrame
         *
@@ -89,10 +92,12 @@ protected:
         *   AddControl(*__pLabel);
         *   this->SetLiveboxFrame(pFrame);
         *   pFrame->Show();
+        *
+        *   return true;
         * }
         * @endcode
         */
-       virtual void OnLiveboxProviderInitializing(int width, int height, const Tizen::Base::String& userInfo) = 0;
+       virtual bool OnLiveboxProviderInitializing(float width, float height, const Tizen::Base::String& userInfo) = 0;
 
        /**
         * Called when the Livebox provider is required to be destroyed @n
@@ -121,9 +126,12 @@ protected:
         * @param[in]   userInfo                User information to update the Livebox provider@n
         *                                                              This parameter is delivered from LiveboxProvider::RequestUpdate()
         *
+        * @return      @c true if the method is successful, @n
+        *              else @c false
+        *
         * @remarks             This function is called when UpdatePeriod timer is expired or LiveboxManager::RequestUpdate() is called.@n
         */
-       virtual void OnLiveboxProviderUpdating(const Tizen::Base::String& userInfo) = 0;
+       virtual bool OnLiveboxProviderUpdating(const Tizen::Base::String& userInfo) = 0;
 
        /**
         * Sets the LiveboxFrame to the LiveboxProvider
@@ -157,7 +165,7 @@ protected:
         *
         * @return      the LiveboxFrame instnace, or null if any LiveboxFrame isn't set yet.
         */
-       const LiveboxFrame* GetLiveboxFrame() const;
+       const LiveboxFrame* GetLiveboxFrame(void) const;
 
 protected:
        //

diff --git a/inc/FShellLiveboxProviderInfo.h b/inc/FShellLiveboxProviderInfo.h
index 663b995..9d9cc2c 100644 (file)
--- a/inc/FShellLiveboxProviderInfo.h
+++ b/inc/FShellLiveboxProviderInfo.h
@@ -68,7 +68,7 @@ public:
         *
         * @return      The application ID
         */
-       Tizen::App::AppId GetAppId() const;
+       Tizen::App::AppId GetAppId(void) const;
 
        /**
         * Gets the Livebox provider name
@@ -77,7 +77,7 @@ public:
         *
         * @return      The application ID
         */
-       Tizen::Base::String GetName() const;
+       Tizen::Base::String GetName(void) const;
 
        /**
         * Gets the display name of the Livbox @n
@@ -88,7 +88,7 @@ public:
         *
         * @return      The display name of the Livbox
         */
-       Tizen::Base::String GetDisplayName() const;
+       Tizen::Base::String GetDisplayName(void) const;
 
        /**
         * Gets the icon path of the application.
@@ -98,7 +98,7 @@ public:
         * @return      The icon path of the application, @n
         * An empty string is returned if there is no value.
         */
-       Tizen::Base::String GetIconPath() const;
+       Tizen::Base::String GetIconPath(void) const;
 
        /**
         * Gets the Id of the application that exports AppContorl to configure the Livebox
@@ -132,7 +132,7 @@ public:
         * delete pProviderInfo;
         * @endcode
         */
-       Tizen::Base::String GetConfigurationAppControlAppId() const;
+       Tizen::Base::String GetConfigurationAppControlAppId(void) const;
 
        /**
        * Checks whether the Livebox provider is default or not.
@@ -145,7 +145,7 @@ public:
        * @remarks              Default Livebox provider providing Livebox that represents application.@n
        *                               Home application can show Livebox instead of icon and text for applications that includes default Livebox provider.
        */
-       bool IsDefault() const;
+       bool IsDefault(void) const;
 
        /**
         * Gets a list of LiveboxSizeInfo of the Livebox
@@ -158,7 +158,7 @@ public:
         * @exception   E_SYSTEM                        The method cannot proceed due to a severe system error.
         * @remarks     The specific error code can be accessed using the GetLastResult() method.
         */
-    Tizen::Base::Collection::IList* GetSizeInfoListN() const;
+    Tizen::Base::Collection::IList* GetSizeInfoListN(void) const;
 
 private:
 

diff --git a/inc/FShellLiveboxProviderManager.h b/inc/FShellLiveboxProviderManager.h
index 1377024..3f6a12c 100755 (executable)
--- a/inc/FShellLiveboxProviderManager.h
+++ b/inc/FShellLiveboxProviderManager.h
@@ -89,7 +89,6 @@ public:
         * @privlevel   public
         * @privilege   http://tizen.org/privilege/liveboxmanager
         *
-        * @param[in]   viewerAppId             The ID of the viewer application that the specified Livebox will be added to
         * @param[in]   providerAppId   The ID of the application providing Livebox
         * @param[in]   providerName    The name of Livebox provider to be added
         * @param[in]   alternateText   Alternate text displayed in the LiveboxView while the LiveboxProvider is initializing or unavailable.
@@ -109,7 +108,7 @@ public:
         * @remarks     Only Livebox provider that is packaged with the caller application can be added by this API.
         * @see         SetLiveboxAddRequestListener
         */
-       result AddLivebox(const Tizen::App::AppId& viewerAppId, const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& alternateText, const Tizen::Base::String& userInfo);
+       result AddLivebox(const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& alternateText, const Tizen::Base::String& userInfo);
 
        /**
         * Sets a LiveboxProvider factory. @n

diff --git a/inc/FShellLiveboxSizeInfo.h b/inc/FShellLiveboxSizeInfo.h
index bc460f3..d8d51de 100644 (file)
--- a/inc/FShellLiveboxSizeInfo.h
+++ b/inc/FShellLiveboxSizeInfo.h
@@ -27,7 +27,7 @@
 
 #include <FBaseString.h>
 #include <FAppTypes.h>
-#include <FGrpDimension.h>
+#include <FGrpFloatDimension.h>
 
 namespace Tizen { namespace Shell
 {
@@ -67,7 +67,7 @@ public:
         *
         * @return      A size
         */
-    Tizen::Graphics::Dimension GetSize() const;
+    Tizen::Graphics::FloatDimension GetSize(void) const;
 
        /**
         * Gets the image path for preview
@@ -76,7 +76,7 @@ public:
         *
         * @return      The image path for preview
         */
-    Tizen::Base::String GetPreviewImagePath() const;
+    Tizen::Base::String GetPreviewImagePath(void) const;
 
 private:
        //
@@ -88,7 +88,7 @@ private:
        // @param[in]   size            One of the size that the Livebox provider supports.
        // @param[in]   previewImagePath                The preview image path for the size.
        //
-    LiveboxSizeInfo(Tizen::Graphics::Dimension size, const Tizen::Base::String& previewImagePath);
+    LiveboxSizeInfo(Tizen::Graphics::FloatDimension size, const Tizen::Base::String& previewImagePath);
 
     //
        // This default constructor is intentionally declared as private so that only the platform can create an instance.

diff --git a/src/FShellLiveboxProviderManager.cpp b/src/FShellLiveboxProviderManager.cpp
index 4fedb17..81a8133 100644 (file)
--- a/src/FShellLiveboxProviderManager.cpp
+++ b/src/FShellLiveboxProviderManager.cpp
@@ -110,9 +110,9 @@ LiveboxProviderManager::RequestUpdate(const Tizen::App::AppId& appId, const Tize
 }
 
 result
-LiveboxProviderManager::AddLivebox(const Tizen::App::AppId& viewerAppId, const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& text, const Tizen::Base::String& userInfo)
+LiveboxProviderManager::AddLivebox(const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& text, const Tizen::Base::String& userInfo)
 {
-       return __pLiveboxProviderManagerImpl->AddLivebox(viewerAppId, providerAppId, providerName, text, userInfo);
+       return __pLiveboxProviderManagerImpl->AddLivebox(providerAppId, providerName, text, userInfo);
 }
 
 }} // Tizen::Shell

diff --git a/src/FShellLiveboxSizeInfo.cpp b/src/FShellLiveboxSizeInfo.cpp
index 13c7c45..8637881 100644 (file)
--- a/src/FShellLiveboxSizeInfo.cpp
+++ b/src/FShellLiveboxSizeInfo.cpp
@@ -37,7 +37,7 @@ using namespace Tizen::Graphics;
 namespace Tizen { namespace Shell
 {
 
-LiveboxSizeInfo::LiveboxSizeInfo(Dimension size, const String& previewImagePath)
+LiveboxSizeInfo::LiveboxSizeInfo(FloatDimension size, const String& previewImagePath)
 {
        __pLiveboxSizeInfoImpl = new (std::nothrow) _LiveboxSizeInfoImpl(size, previewImagePath);
 }
@@ -59,7 +59,7 @@ LiveboxSizeInfo::~LiveboxSizeInfo()
 {
 }
 
-Dimension
+FloatDimension
 LiveboxSizeInfo::GetSize() const
 {
        return __pLiveboxSizeInfoImpl->GetSize();

diff --git a/src/FShell_LiveboxProviderInfoImpl.cpp b/src/FShell_LiveboxProviderInfoImpl.cpp
index 538da8a..b669473 100644 (file)
--- a/src/FShell_LiveboxProviderInfoImpl.cpp
+++ b/src/FShell_LiveboxProviderInfoImpl.cpp
@@ -133,13 +133,13 @@ _LiveboxProviderInfoImpl::GetSizeInfoListN() const
        SysTryReturn(NID_APP, pSizes, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Failed to allocate memory for ArrayList." );
 
        pSizes->Construct();
-       Dimension size(0, 0);
+       FloatDimension size(0, 0);
        String previewImagePath;
 
        for(int i = 0; i < supportedSizeCount; i++)
        {
                size.SetSize(widthArray[i], heightArray[i]);
-               previewImagePath  = livebox_service_preview(pPackageId.get(), livebox_service_size_type(size.width, size.height) );
+               previewImagePath  = livebox_service_preview(pPackageId.get(), livebox_service_size_type(static_cast<int>(size.width), static_cast<int>(size.height) ) );
                std::unique_ptr<LiveboxSizeInfo> pLiveboxSizeInfo(_LiveboxSizeInfoImpl::CreateLiveboxSizeInfo(size, previewImagePath) );
                SysTryReturn(NID_APP, pLiveboxSizeInfo, null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Failed to allocate memory for LiveboxSizeInfo." );
                pSizes->Add( *pLiveboxSizeInfo.release() );

diff --git a/src/FShell_LiveboxProviderManagerImpl.cpp b/src/FShell_LiveboxProviderManagerImpl.cpp
index b22f9c0..4542395 100644 (file)
--- a/src/FShell_LiveboxProviderManagerImpl.cpp
+++ b/src/FShell_LiveboxProviderManagerImpl.cpp
@@ -123,7 +123,7 @@ _LiveboxProviderManagerImpl::Construct()
 {
        SysLog(NID_APP, "Enter.");
 
-       __liveBoxes.Construct();
+       __liveboxProviders.Construct();
        __touchEventListeners.Construct();
 
        Tizen::App::_AppImpl::GetInstance()->SetAppControlProviderInternalEventListener(this);
@@ -222,7 +222,7 @@ _LiveboxProviderManagerImpl::RequestUpdateInstance(const Tizen::Base::String& in
        if(ContainsLivebox(instanceId))
        {
                LiveboxProvider* pLiveboxProvider = null;
-               __liveBoxes.GetValue(instanceId, pLiveboxProvider);
+               __liveboxProviders.GetValue(instanceId, pLiveboxProvider);
 
                LiveboxFrame* pLiveBoxFrame = pLiveboxProvider->GetLiveboxFrame();
                SysTryReturnResult(NID_APP, pLiveBoxFrame, E_SYSTEM, "Failed to GetLiveboxFrame");
@@ -254,7 +254,7 @@ int AddLiveboxCallback(int ret, int pid, void *data)
 }
 
 result
-_LiveboxProviderManagerImpl::AddLivebox(const Tizen::App::AppId& viewerAppId, const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& text, const Tizen::Base::String& userInfo)
+_LiveboxProviderManagerImpl::AddLivebox(const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& text, const Tizen::Base::String& userInfo)
 {
        SysTryReturnResult(NID_APP, providerAppId.IsEmpty()==false, E_INVALID_ARG, "The providerAppId is empty.");
        SysTryReturnResult(NID_APP, providerAppId.GetLength() < NATIVE_APP_MAX_APPID_LENGTH, E_INVALID_ARG, "The providerAppId is too long (Maximum %d bytes).", NATIVE_APP_MAX_APPID_LENGTH);
@@ -305,7 +305,7 @@ bool
 _LiveboxProviderManagerImpl::ContainsLivebox(const String& instanceId) const
 {
        bool contains = false;
-       __liveBoxes.ContainsKey(instanceId, contains);
+       __liveboxProviders.ContainsKey(instanceId, contains);
 
        return contains;
 }
@@ -578,7 +578,7 @@ _LiveboxProviderManagerImpl::CreateLivebox(const String& name, const String& ins
        SysTryReturnResult(NID_APP, pLivebox, E_INVALID_OPERATION, "[E_INVALID_OPERATION]");
 
        pLivebox->Construct(instanceId);
-       __liveBoxes.Add(instanceId, pLivebox);
+       __liveboxProviders.Add(instanceId, pLivebox);
 
        pLivebox->OnLiveboxProviderInitializing(width, height, userInfo);
 
@@ -593,7 +593,7 @@ _LiveboxProviderManagerImpl::UpdateLivebox(const String& instanceId, int width,
        SysLog(NID_APP, "instanceId(%ls), w:%d, h:%d, argument:%ls", instanceId.GetPointer(), width, height, argument.GetPointer() );
 
        LiveboxProvider* pLivebox = null;
-       __liveBoxes.GetValue(instanceId, pLivebox);
+       __liveboxProviders.GetValue(instanceId, pLivebox);
        SysTryReturnResult(NID_APP, pLivebox, E_SYSTEM, "Can't find the Livebox provider");
 
        pLivebox->OnLiveboxProviderUpdating(argument);
@@ -607,7 +607,7 @@ _LiveboxProviderManagerImpl::ResizeLivebox(const String& instanceId, int width,
        SysLog(NID_APP, "instanceId(%ls), w:%d, h:%d", instanceId.GetPointer(), width, height);
 
        LiveboxProvider* pLivebox = null;
-       __liveBoxes.GetValue(instanceId, pLivebox);
+       __liveboxProviders.GetValue(instanceId, pLivebox);
        SysTryReturnResult(NID_APP, pLivebox, E_SYSTEM, "Can't find the Livebox provider");
 
        LiveboxFrame* pLiveBoxFrame = pLivebox->GetLiveboxFrame();
@@ -623,16 +623,18 @@ _LiveboxProviderManagerImpl::RemoveLivebox(const String& instanceId, bool termin
 //     __pLiveboxEventListener->OnLiveboxRemoved(instanceId);
 
        LiveboxProvider* pLiveboxProvider = null;
-       __liveBoxes.GetValue(instanceId, pLiveboxProvider);
-       __liveBoxes.Remove(instanceId);
+       __liveboxProviders.GetValue(instanceId, pLiveboxProvider);
+       result r = __liveboxProviders.Remove(instanceId);
+       SysLog(NID_APP, "%s", GetErrorMessage(r) );
 
        if( pLiveboxProvider != null)
        {
                delete pLiveboxProvider;
        }
 
-//     this->__pLiveboxEventListener->OnLiveboxRemoved(instanceId);
-       if( terminateIfFinished && this->__liveBoxes.GetCount() == 0)
+       SysLog(NID_APP, "(%d) provider(s) remains.", __liveboxProviders.GetCount() );
+
+       if( terminateIfFinished && this->__liveboxProviders.GetCount() == 0)
        {
                Tizen::App::App::GetInstance()->Terminate();
        }
@@ -653,7 +655,7 @@ _LiveboxProviderManagerImpl::CreateLiveboxPopupProvider(const String& instanceId
        __pLiveboxPopupProvider->OnLiveboxPopupProviderInitializing(userInfo);
 
        LiveboxPopup* pLiveBoxFrame = pPd->GetLiveboxPopup();
-       SysTryReturnResult(NID_APP, pLiveBoxFrame, E_INVALID_OPERATION, "[E_INVALID_OPERATION]");
+       SysTryReturnResult(NID_APP, pLiveBoxFrame, E_INVALID_OPERATION, "[E_INVALID_OPERATION] LiveboxPopup should be set using LiveboxPopupProvider::SetLiveboxPopup()");
 
        return E_SUCCESS;
 }
@@ -702,37 +704,55 @@ _LiveboxProviderManagerImpl::ForwardTouchEventForPD(const String& instanceId, in
 result
 _LiveboxProviderManagerImpl::RequestSharedMemoryId(const Tizen::Base::String& instanceId, int width, int height, int& shmId)
 {
-       return _LiveboxManagerProxy::GetInstance()->RequestSharedMemoryId(instanceId, width, height, shmId);
+       _LiveboxManagerProxy* pProxy = _LiveboxManagerProxy::GetInstance();
+       SysTryReturnResult(NID_APP, pProxy, E_SYSTEM, "Failed to get proxy instance!");
+
+       return pProxy->RequestSharedMemoryId(instanceId, width, height, shmId);
 }
 
 result
 _LiveboxProviderManagerImpl::RequestSharedMemoryIdForPD(const Tizen::Base::String& instanceId, int width, int height, int& shmId)
 {
-       return _LiveboxManagerProxy::GetInstance()->RequestSharedMemoryIdForPD(instanceId, width, height, shmId);
+       _LiveboxManagerProxy* pProxy = _LiveboxManagerProxy::GetInstance();
+       SysTryReturnResult(NID_APP, pProxy, E_SYSTEM, "Failed to get proxy instance!");
+
+       return pProxy->RequestSharedMemoryIdForPD(instanceId, width, height, shmId);
 }
 
 result
 _LiveboxProviderManagerImpl::RequestReleaseSharedMemory(const Tizen::Base::String& instanceId)
 {
-       return _LiveboxManagerProxy::GetInstance()->RequestReleaseSharedMemory(instanceId);
+       _LiveboxManagerProxy* pProxy = _LiveboxManagerProxy::GetInstance();
+       SysTryReturnResult(NID_APP, pProxy, E_SYSTEM, "Failed to get proxy instance!");
+
+       return pProxy->RequestReleaseSharedMemory(instanceId);
 }
 
 result
 _LiveboxProviderManagerImpl::RequestReleaseSharedMemoryForPD(const Tizen::Base::String& instanceId)
 {
-       return _LiveboxManagerProxy::GetInstance()->RequestReleaseSharedMemoryForPD(instanceId);
+       _LiveboxManagerProxy* pProxy = _LiveboxManagerProxy::GetInstance();
+       SysTryReturnResult(NID_APP, pProxy, E_SYSTEM, "Failed to get proxy instance!");
+
+       return pProxy->RequestReleaseSharedMemoryForPD(instanceId);
 }
 
 result
 _LiveboxProviderManagerImpl::RequestSyncSharedMemory(const Tizen::Base::String& instanceId, int width, int height)
 {
-       return _LiveboxManagerProxy::GetInstance()->RequestSyncSharedMemory(instanceId, width, height);
+       _LiveboxManagerProxy* pProxy = _LiveboxManagerProxy::GetInstance();
+       SysTryReturnResult(NID_APP, pProxy, E_SYSTEM, "Failed to get proxy instance!");
+
+       return pProxy->RequestSyncSharedMemory(instanceId, width, height);
 }
 
 result
 _LiveboxProviderManagerImpl::RequestSyncSharedMemoryForPD(const Tizen::Base::String& instanceId)
 {
-       return _LiveboxManagerProxy::GetInstance()->RequestSyncSharedMemoryForPD(instanceId);
+       _LiveboxManagerProxy* pProxy = _LiveboxManagerProxy::GetInstance();
+       SysTryReturnResult(NID_APP, pProxy, E_SYSTEM, "Failed to get proxy instance!");
+
+       return pProxy->RequestSyncSharedMemoryForPD(instanceId);
 }
 
 }} // Tizen::Shell

diff --git a/src/FShell_LiveboxSizeInfoImpl.cpp b/src/FShell_LiveboxSizeInfoImpl.cpp
index f9ec4b8..f308bee 100644 (file)
--- a/src/FShell_LiveboxSizeInfoImpl.cpp
+++ b/src/FShell_LiveboxSizeInfoImpl.cpp
@@ -39,7 +39,7 @@ using namespace Tizen::Graphics;
 namespace Tizen { namespace Shell
 {
 
-_LiveboxSizeInfoImpl::_LiveboxSizeInfoImpl(Dimension size, const String& previewImagePath)
+_LiveboxSizeInfoImpl::_LiveboxSizeInfoImpl(FloatDimension size, const String& previewImagePath)
 {
        __size = size;
        __previewImagePath = previewImagePath;
@@ -65,12 +65,12 @@ _LiveboxSizeInfoImpl::~_LiveboxSizeInfoImpl()
 }
 
 LiveboxSizeInfo*
-_LiveboxSizeInfoImpl::CreateLiveboxSizeInfo(Tizen::Graphics::Dimension size, const Tizen::Base::String& previewImagePath)
+_LiveboxSizeInfoImpl::CreateLiveboxSizeInfo(Tizen::Graphics::FloatDimension size, const Tizen::Base::String& previewImagePath)
 {
        return new (std::nothrow) LiveboxSizeInfo(size, previewImagePath);
 }
 
-Dimension
+FloatDimension
 _LiveboxSizeInfoImpl::GetSize() const
 {
        return __size;

diff --git a/src/inc/FShell_LiveboxProviderManagerImpl.h b/src/inc/FShell_LiveboxProviderManagerImpl.h
index 8ad09fa..e747a0f 100644 (file)
--- a/src/inc/FShell_LiveboxProviderManagerImpl.h
+++ b/src/inc/FShell_LiveboxProviderManagerImpl.h
@@ -57,7 +57,7 @@ public:
        result SetLiveboxProviderFactory(ILiveboxProviderFactory& factory);
        result SetLiveboxPopupProviderFactory(ILiveboxPopupProviderFactory& factory);
        result RequestUpdate(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& argument);
-       result AddLivebox(const Tizen::App::AppId& viewerAppId, const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& text, const Tizen::Base::String& userInfo);
+       result AddLivebox(const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& text, const Tizen::Base::String& userInfo);
 
        // internal APIs
        result RequestUpdateInstance(const Tizen::Base::String& instanceId, const Tizen::Base::String& argument = L"");
@@ -104,7 +104,7 @@ private:
 private:
        // for Livebox
        ILiveboxProviderFactory* __pLiveboxFactory;
-       Tizen::Base::Collection::HashMapT<Tizen::Base::String, LiveboxProvider*> __liveBoxes;
+       Tizen::Base::Collection::HashMapT<Tizen::Base::String, LiveboxProvider*> __liveboxProviders;
        Tizen::Base::Collection::HashMapT<Tizen::Base::String, _ILiveboxTouchEventListener*> __touchEventListeners;
 
        // for LiveboxPopup

diff --git a/src/inc/FShell_LiveboxSizeInfoImpl.h b/src/inc/FShell_LiveboxSizeInfoImpl.h
index c522bbd..53a846b 100644 (file)
--- a/src/inc/FShell_LiveboxSizeInfoImpl.h
+++ b/src/inc/FShell_LiveboxSizeInfoImpl.h
@@ -27,7 +27,7 @@
 
 #include <FBaseString.h>
 #include <FBaseCol.h>
-#include <FGrpDimension.h>
+#include <FGrpFloatDimension.h>
 #include <FAppTypes.h>
 
 namespace Tizen { namespace Shell
@@ -76,7 +76,7 @@ public:
         *
         * @return      A size
         */
-    Tizen::Graphics::Dimension GetSize() const;
+    Tizen::Graphics::FloatDimension GetSize() const;
 
        /**
         * Gets the image path for preview
@@ -87,7 +87,7 @@ public:
         */
     Tizen::Base::String GetPreviewImagePath() const;
 
-    static LiveboxSizeInfo* CreateLiveboxSizeInfo(Tizen::Graphics::Dimension size, const Tizen::Base::String& previewImagePath);
+    static LiveboxSizeInfo* CreateLiveboxSizeInfo(Tizen::Graphics::FloatDimension size, const Tizen::Base::String& previewImagePath);
 
 private:
     /**
@@ -102,10 +102,10 @@ private:
         *
         * @since 2.1
         */
-    _LiveboxSizeInfoImpl(Tizen::Graphics::Dimension size, const Tizen::Base::String& previewImagePath);
+    _LiveboxSizeInfoImpl(Tizen::Graphics::FloatDimension size, const Tizen::Base::String& previewImagePath);
 
 private:
-    Tizen::Graphics::Dimension __size;
+    Tizen::Graphics::FloatDimension __size;
     Tizen::Base::String __previewImagePath;
 
 friend class LiveboxSizeInfo;