Ifdef remaining PWA code.

Change-Id: I4fbd3889f729d3eaa4dca982beec3fa2f7370904

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index fa756798e58f9a32b0c6a57c27d93ab7e10ad8d4..8714de8b2776c994dc36613bcdcbf1721fb65458 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -81,7 +81,9 @@ SimpleUI::SimpleUI()
     , m_tabLimit(0)
     , m_favoritesLimit(0)
     , m_wvIMEStatus(false)
+#if PWA
     , m_pwa()
+#endif
 #if PROFILE_MOBILE
     , m_current_angle(0)
     , m_temp_angle(0)
@@ -190,7 +192,7 @@ int SimpleUI::exec(const std::string& _url, const std::string& _caller)
             m_platformInputManager->registerHWKeyCallback(m_viewManager.getContent());
 #endif
         }
-
+#if PWA
         // Progressive web app
         if (!strncmp(url.c_str(), "browser_shortcut:", strlen("browser_shortcut:"))) {
             BROWSER_LOGD("Progressive web app");
@@ -205,7 +207,7 @@ int SimpleUI::exec(const std::string& _url, const std::string& _caller)
             else if (m_pwa.getPWAinfo().orientation == WebPageUI::landscape_primary)
                 rotationType(rotationLock::landscape);
         }
-
+#endif
         if (url.empty())
         {
             BROWSER_LOGD("[%s]: restore last session", __func__);

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index a09debb64d455023996f8b1d939873a539b851b5..0ea91a7129552fdcf6afa220ef407387dc3bab36 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -64,8 +64,10 @@
 #include "WebConfirmation.h"
 #include "ViewManager.h"
 #include "MenuButton.h"
-#include "ProgressiveWebApp.h"
 #include "NaviframeWrapper.h"
+#if PWA
+#include "ProgressiveWebApp.h"
+#endif
 
 namespace tizen_browser{
 namespace base_ui{
@@ -372,7 +374,9 @@ private:
     //helper object used to view management
     ViewManager m_viewManager;
     Evas_Object *main_window;
+#if PWA
     ProgressiveWebApp m_pwa;
+#endif
     SharedNaviframeWrapper m_QAEditNaviframe;
 #if PROFILE_MOBILE
     Evas_Object *m_conformant;

diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index 82baf9d374d9b4de7eed472f137b4124e47eccb3..0e508c1ae15b666342c50a8041e2cb979a6d9460 100755 (executable)
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -48,7 +48,9 @@ WebPageUI::WebPageUI()
     , m_urlHistoryList(std::make_shared<UrlHistoryList>(getStatesMgr()))
     , m_webviewLocked(false)
     , m_WebPageUIvisible(false)
+#if PWA
     , m_pwaInfo(nullptr)
+#endif
 #if GESTURE
     , m_gestureLayer(nullptr)
 #endif
@@ -822,6 +824,7 @@ Eina_Bool WebPageUI::_hideDelay(void *data)
     return ECORE_CALLBACK_CANCEL;
 }
 
+#if PWA
 void WebPageUI::setDisplayMode(WebPageUI::WebDisplayMode mode)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
@@ -834,6 +837,7 @@ void WebPageUI::setDisplayMode(WebPageUI::WebDisplayMode mode)
     else if (mode == WebDisplayMode::WebDisplayModeBrowser)
         elm_object_signal_emit(m_mainLayout, "webview_default", "ui");
 }
+#endif
 
 void WebPageUI:: launch_share(const char *uri)
 {

diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h
index f076b4585852121bdf6d4fae51a23f8b39d16a89..972b53fff86a1e668ddb8918bb502a0a40856087 100755 (executable)
--- a/services/WebPageUI/WebPageUI.h
+++ b/services/WebPageUI/WebPageUI.h
@@ -45,6 +45,8 @@ class BROWSER_EXPORT WebPageUI
         , public tizen_browser::interfaces::AbstractRotatable
 {
 public:
+
+#if PWA
     typedef enum OrientationType {
         portrait_primary = 0,
         portrait_secondary,
@@ -72,6 +74,7 @@ public:
         long            themeColor;
         long            backgroundColor;
     };
+#endif
 
     WebPageUI();
     virtual ~WebPageUI();
@@ -122,8 +125,9 @@ public:
     static Eina_Bool _hideDelay(void *data);
     void setDesktopMode(bool desktopMode) {m_desktopMode = desktopMode;}
     bool getDesktopMode() { return m_desktopMode; }
+#if PWA
     void setDisplayMode(WebDisplayMode mode);
-
+#endif
     std::string getURI();
 
     boost::signals2::signal<void ()> backPage;
@@ -227,7 +231,9 @@ private:
     sharedAction m_bookmarks;
     sharedAction m_tabs;
 
+#if PWA
     std::shared_ptr<pwaInfo> m_pwaInfo;
+#endif
 
 #if GESTURE
     Evas_Object* m_gestureLayer;