[Common] Build break

[Issue]        N/A
[Problem]      Build break on branch Common.
[Solution]     Add #if PROFILE_MOBILE where it is needed
[Verify]       Build browser using ./build.sh

Change-Id: I5a63ea894fd375718b7cf959c267ca7e30437523

diff --git a/services/MoreMenuUI/MoreMenuUI.cpp b/services/MoreMenuUI/MoreMenuUI.cpp
index 3e0d1c598244eebf2e161387c580f99e0fcaad24..af47e137848e28eb641854c094af2cdc1eaa3a9a 100755 (executable)
--- a/services/MoreMenuUI/MoreMenuUI.cpp
+++ b/services/MoreMenuUI/MoreMenuUI.cpp
@@ -90,11 +90,13 @@ void MoreMenuUI::init(Evas_Object* parent)
     m_parent = parent;
 }
 
+#if PROFILE_MOBILE
 void MoreMenuUI::updateBookmarkButton()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     elm_gengrid_item_update(m_map_menu_views[ADD_TO_BOOKMARK]);
 }
+#endif
 
 void MoreMenuUI::showUI()
 {

diff --git a/services/MoreMenuUI/MoreMenuUI.h b/services/MoreMenuUI/MoreMenuUI.h
index 608aa3b2004958d3d5766ec6e893ad287adc1be2..9458b7909ce62e4e8bc0021d081dd62a4cccd51f 100755 (executable)
--- a/services/MoreMenuUI/MoreMenuUI.h
+++ b/services/MoreMenuUI/MoreMenuUI.h
@@ -81,7 +81,6 @@ public:
     //AbstractUIComponent interface methods
     void init(Evas_Object* parent);
     Evas_Object* getContent();
-    void updateBookmarkButton();
     void showUI();
     void hideUI();
 
@@ -99,6 +98,7 @@ public:
     void createToastPopup(const char* text);
     void setFocus(Eina_Bool focusable);
 #if PROFILE_MOBILE
+    void updateBookmarkButton();
     void blockThumbnails(bool blockThumbnails);
     void shouldShowFindOnPage(bool show);
     void resetContent();

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 5b4765be44bef16127202905b028f0f234a7f0a2..0d767ebf1a23702108f02932ced710e4c6265085 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -546,7 +546,6 @@ void SimpleUI::connectModelSignals()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 
     m_webEngine->minimizeBrowser.connect(boost::bind(&SimpleUI::minimizeBrowser, this));
-    m_webEngine->uriChanged.connect(boost::bind(&SimpleUI::webEngineURLChanged, this, _1));
     m_webEngine->uriChanged.connect(boost::bind(&URIEntry::changeUri, &m_webPageUI->getURIEntry(), _1));
     m_webEngine->downloadStarted.connect(boost::bind(&SimpleUI::downloadStarted, this, _1));
     m_webEngine->backwardEnableChanged.connect(boost::bind(&WebPageUI::setBackButtonEnabled, m_webPageUI.get(), _1));
@@ -571,6 +570,7 @@ 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));
 #if PROFILE_MOBILE
+    m_webEngine->uriChanged.connect(boost::bind(&SimpleUI::webEngineURLChanged, this, _1));
     m_webEngine->confirmationRequest.connect(boost::bind(&SimpleUI::handleConfirmationRequest, this, _1));
     m_webEngine->getRotation.connect(boost::bind(&SimpleUI::getRotation, this));
     m_webEngine->openFindOnPage.connect(boost::bind(&SimpleUI::showFindOnPageUI, this, _1));
@@ -1276,6 +1276,12 @@ int SimpleUI::getZoomFactor()
 }
 #endif
 
+void SimpleUI::scrollView(const int& dx, const int& dy)
+{
+    m_webEngine->scrollView(dx, dy);
+}
+
+#if PROFILE_MOBILE
 void SimpleUI::webEngineURLChanged(const std::string url)
 {
     BROWSER_LOGD("webEngineURLChanged:%s", url.c_str());
@@ -1283,12 +1289,6 @@ void SimpleUI::webEngineURLChanged(const std::string url)
         m_moreMenuUI->updateBookmarkButton();
 }
 
-void SimpleUI::scrollView(const int& dx, const int& dy)
-{
-    m_webEngine->scrollView(dx, dy);
-}
-
-#if PROFILE_MOBILE
 void SimpleUI::showFindOnPageUI(const std::string& str)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index c95b2c2643b87a2425091eea592ffd9a9b008e57..7db348199d3a806a9ed3a55b476b0d54214a4828 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -132,7 +132,8 @@ private:
 #else
     void openNewTab(const std::string &uri, const std::string& title =
             std::string(), const boost::optional<int> adaptorId = boost::none,
-            bool desktopMode = true, bool incognitoMode = false);
+            bool desktopMode = true, bool incognitoMode = false,
+            basic_webengine::TabOrigin origin = basic_webengine::TabOrigin::UNKNOWN);
 #endif
 
     void switchToTab(const tizen_browser::basic_webengine::TabId& tabId);
@@ -195,6 +196,14 @@ private:
 #if PROFILE_MOBILE
     void onMenuButtonPressed();
     void handleConfirmationRequest(basic_webengine::WebConfirmationPtr webConfirmation);
+
+    /**
+     * \brief check if url comming back from WebEngine should be passed to URI.
+     *
+     * For filtered addresses we need to hide real URI so the user would be confused.
+     * and this is a back function that checks if address emited from browser should be changed.
+     */
+    void webEngineURLChanged(const std::string url);
 #else
     void onRedKeyPressed();
     void onYellowKeyPressed();
@@ -217,13 +226,6 @@ private:
     // on uri entry widget "changed" signal
     void onURLEntryEdited();
 
-    /**
-     * \brief check if url comming back from WebEngine should be passed to URI.
-     *
-     * For filtered addresses we need to hide real URI so the user would be confused.
-     * and this is a back function that checks if address emited from browser should be changed.
-     */
-    void webEngineURLChanged(const std::string url);
     void onmostHistoryvisitedClicked();
     void onBookmarkvisitedClicked();
 

diff --git a/services/WebPageUI/URIEntry.cpp b/services/WebPageUI/URIEntry.cpp
index e7973ede3b932c40c74c9844fd6f854adcb921b3..1c8575294a1bd11ce9a3cd9b5a22cfe46bfeaddb 100644 (file)
--- a/services/WebPageUI/URIEntry.cpp
+++ b/services/WebPageUI/URIEntry.cpp
@@ -127,7 +127,9 @@ void URIEntry::changeUri(const std::string& newUri)
         } else
             elm_entry_entry_set(m_entry, elm_entry_utf8_to_markup(""));
     }
+#if PROFILE_MOBILE
     updateSecureIcon();
+#endif
 }
 
 void URIEntry::setFavIcon(std::shared_ptr< tizen_browser::tools::BrowserImage > favicon)

diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index 2bd971a3361eecf5b3da34f070b2f3dee7adf2dc..6bbfe7fc3dec30090272309484eb143f60db9929 100755 (executable)
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -177,7 +177,9 @@ void WebPageUI::loadFinished()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     m_leftButtonBar->setActionForButton("refresh_stop_button", m_reload);
     hideProgressBar();
+#if PROFILE_MOBILE
     m_URIEntry->updateSecureIcon();
+#endif
 }
 
 void WebPageUI::toIncognito(bool incognito)