PWA useless function and logic modify to browser code.

Change-Id: I8e164705a1825e51bf26a9a03be2f7db9b98bcac
Signed-off-by: Lim DoHyung <delight.lim@samsung.com>

diff --git a/core/AbstractWebEngine/AbstractWebEngine.h b/core/AbstractWebEngine/AbstractWebEngine.h
index c1f34ff5947096c33cf58edc9b496a1e96de3d17..ac032bd38b6e7035e5adce167bf5ee06d301e0f4 100644 (file)
--- a/core/AbstractWebEngine/AbstractWebEngine.h
+++ b/core/AbstractWebEngine/AbstractWebEngine.h
@@ -572,8 +572,6 @@ public:
     boost::signals2::signal<void(bool)> fullscreenModeSet;
 
 #if PWA
-    boost::signals2::signal<void (std::string)> resultDataManifest;
-
     boost::signals2::signal<void (std::string)> iconDownload;
 #endif
 

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 8714de8b2776c994dc36613bcdcbf1721fb65458..762cd585e1da503a380dfaeda94de012052fe8c2 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -630,9 +630,6 @@ void SimpleUI::connectModelSignals()
     m_webEngine->setCertificatePem.connect(boost::bind(&services::CertificateContents::saveCertificateInfo, m_certificateContents, _1, _2));
     m_webEngine->setWrongCertificatePem.connect(boost::bind(&services::CertificateContents::saveWrongCertificateInfo, m_certificateContents, _1, _2));
     m_webEngine->fullscreenModeSet.connect(boost::bind(&WebPageUI::fullscreenModeSet, m_webPageUI.get(), _1));
-#if PWA
-    m_webEngine->resultDataManifest.connect(boost::bind(&SimpleUI::resultDataManifest, this, _1));
-#endif
 #if PROFILE_MOBILE
     m_webEngine->confirmationRequest.connect(boost::bind(&SimpleUI::handleConfirmationRequest, this, _1));
     m_webEngine->getRotation.connect(boost::bind(&SimpleUI::getRotation, this));
@@ -1665,14 +1662,6 @@ std::string SimpleUI::requestSettingsCurrentPage()
     return m_webEngine->getURI();
 }
 
-#if PWA
-void SimpleUI::resultDataManifest(std::string pwaData)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    m_webPageUI->resultDataManifest(pwaData);
-}
-#endif
-
 void SimpleUI::selectSettingsOtherPageChange()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index 0ea91a7129552fdcf6afa220ef407387dc3bab36..2468da5ad5b8ca152189b53c5a718a50e33bad84 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -277,9 +277,6 @@ private:
     void onSaveContentToClicked();
     std::string requestSettingsCurrentPage();
     void selectSettingsOtherPageChange();
-#if PWA
-    void resultDataManifest(std::string pwaData);
-#endif
 
     void onEditOtherPagePopupClicked(const std::string& newName);
     void showBookmarkFlowUI();

diff --git a/services/WebEngineService/WebEngineService.cpp b/services/WebEngineService/WebEngineService.cpp
index 63286af5b669a9ee19f381efc619d0fd922a6f9b..f431eb766fe0e90c09dfc98d426c3b510017b338 100755 (executable)
--- a/services/WebEngineService/WebEngineService.cpp
+++ b/services/WebEngineService/WebEngineService.cpp
@@ -148,7 +148,6 @@ void WebEngineService::connectSignals(std::shared_ptr<WebView> webView)
     webView->setWrongCertificatePem.connect(boost::bind(&WebEngineService::_setWrongCertificatePem, this, _1, _2));
     webView->fullscreenModeSet.connect([this](auto state){fullscreenModeSet(state);});
 #if PWA
-    webView->resultDataManifest.connect(boost::bind(&WebEngineService::_resultDataManifest, this, _1));
     webView->iconDownload.connect(boost::bind(&WebEngineService::_iconDownload, this, _1));
 #endif
 #if PROFILE_MOBILE
@@ -177,7 +176,6 @@ void WebEngineService::disconnectSignals(std::shared_ptr<WebView> webView)
     webView->redirectedWebPage.disconnect(boost::bind(&WebEngineService::_redirectedWebPage, this, _1, _2));
     webView->fullscreenModeSet.disconnect_all_slots();
 #if PWA
-    webView->resultDataManifest.disconnect(boost::bind(&WebEngineService::_resultDataManifest, this));
     webView->iconDownload.disconnect(boost::bind(&WebEngineService::_iconDownload, this));
 #endif
 #if PROFILE_MOBILE
@@ -244,12 +242,6 @@ void WebEngineService::requestManifest()
     m_currentWebView->requestManifest();
 }
 
-void WebEngineService::_resultDataManifest(std::string pwaData)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    resultDataManifest(pwaData);
-}
-
 void WebEngineService::_iconDownload(std::string download_uri)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);

diff --git a/services/WebEngineService/WebEngineService.h b/services/WebEngineService/WebEngineService.h
index eb07a1834f6c341182c3fc611c424cc9ac5a0978..30a3e2d3a7211dd1f0c9e20b8624da11b0a6d7a9 100644 (file)
--- a/services/WebEngineService/WebEngineService.h
+++ b/services/WebEngineService/WebEngineService.h
@@ -247,7 +247,6 @@ private:
     void _setCertificatePem(const std::string& uri, const std::string& pem);
     void _setWrongCertificatePem(const std::string& uri, const std::string& pem);
 #if PWA
-    void _resultDataManifest(std::string pwaData);
     void _iconDownload(std::string download_uri);
 #endif
 #if PROFILE_MOBILE

diff --git a/services/WebEngineService/WebView.cpp b/services/WebEngineService/WebView.cpp
index 9d08f61f2e92ef864f97a70939fe6d2d2685f2c6..862c85c7b6438ba57acbfb3355640f84dcc27765 100755 (executable)
--- a/services/WebEngineService/WebView.cpp
+++ b/services/WebEngineService/WebView.cpp
@@ -676,12 +676,10 @@ void WebView::requestManifest(void)
     ewk_view_request_manifest(m_ewkView, dataSetManifest, this);
 }
 
-void WebView::dataSetManifest(Evas_Object* view, Ewk_View_Request_Manifest* manifest, void* data)
+void WebView::dataSetManifest(Evas_Object* view, Ewk_View_Request_Manifest* manifest, void* /*data*/)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
-    WebView * self = reinterpret_cast<WebView *>(data);
-
     if (view) {
         const char* short_name(ewk_manifest_short_name_get(manifest));
         const char* name(ewk_manifest_name_get(manifest));
@@ -751,7 +749,6 @@ void WebView::dataSetManifest(Evas_Object* view, Ewk_View_Request_Manifest* mani
             BROWSER_LOGE("[%s:%d] Fail to add to homescreen", __PRETTY_FUNCTION__, __LINE__);
         } else {
             BROWSER_LOGE("[%s:%d] Success to add to homescreen", __PRETTY_FUNCTION__, __LINE__);
-            self->resultDataManifest(m_pwaData);
         }
         BROWSER_LOGD("[%s:%d] dataSetManifest callback function end!", __PRETTY_FUNCTION__, __LINE__);
     }

diff --git a/services/WebEngineService/WebView.h b/services/WebEngineService/WebView.h
index 8a899ba8ffefef5a4603b266889cb80e5f19c65f..dd26e8828530849ac6d1d391f3203d71758b4f9c 100644 (file)
--- a/services/WebEngineService/WebView.h
+++ b/services/WebEngineService/WebView.h
@@ -286,7 +286,6 @@ public:
     boost::signals2::signal<void()> unsecureConnection;
     boost::signals2::signal<void(bool)> fullscreenModeSet;
 #if PWA
-    boost::signals2::signal<void (std::string)> resultDataManifest;
     boost::signals2::signal<void (std::string)> iconDownload;
 #endif
 

diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index 0e508c1ae15b666342c50a8041e2cb979a6d9460..592995a8265c1e7b38683e27b52749423713bc33 100755 (executable)
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -549,7 +549,7 @@ void WebPageUI::_cm_add_to_hs_clicked(void* data, Evas_Object*, void* )
         _cm_dismissed(nullptr, webPageUI->m_ctxpopup, nullptr);
 
         // send request API.
-        pwaRequestManifest();
+        webPageUI->pwaRequestManifest();
     }
     else {
         BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);