Exclude zoomUI from mobile build

[Issue]        http://suprem.sec.samsung.net/jira/browse/TWF-1266
[Problem]      Browser starts too long
[Solution]     Excluded service which is not used by mobile version
               of browser.
[Verify]       Build and run browser.

Change-Id: Ibbc144e3cf17933ebd26d7b834d9c7f6588168cf
Signed-off-by: Maciej Skrzypkowski <m.skrzypkows@samsung.com>

diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index f017ba602f1e8b902561602d78c9aa68e1311d42..d73ce83af4b9a30b11af082195a2afada3479e53 100644 (file)
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -16,8 +16,9 @@ add_subdirectory(HistoryService)
 add_subdirectory(TabService)
 add_subdirectory(PlatformInputManager)
 add_subdirectory(BookmarkService)
-add_subdirectory(ZoomUI)
 add_subdirectory(CertificateService)
 if (${PROFILE} MATCHES "mobile")    # mobile profile
     add_subdirectory(FindOnPageUI)
+else (${PROFILE} MATCHES "mobile")
+    add_subdirectory(ZoomUI)
 endif (${PROFILE} MATCHES "mobile")

diff --git a/services/SimpleUI/CMakeLists.txt b/services/SimpleUI/CMakeLists.txt
index 9dc387b3b124628f9af413a74713809acfaddf5e..0b9ca63a3acab9e95846dc393002b4d5371b1cb0 100644 (file)
--- a/services/SimpleUI/CMakeLists.txt
+++ b/services/SimpleUI/CMakeLists.txt
@@ -37,11 +37,12 @@ include_directories(${CMAKE_SOURCE_DIR}/services/HistoryUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/QuickAccess)
 include_directories(${CMAKE_SOURCE_DIR}/services/SettingsUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/TabUI)
-include_directories(${CMAKE_SOURCE_DIR}/services/ZoomUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/PlatformInputManager)
 include_directories(${CMAKE_SOURCE_DIR}/services/CertificateService)
 if (${PROFILE} MATCHES "mobile")
     include_directories(${CMAKE_SOURCE_DIR}/services/FindOnPageUI)
+else (${PROFILE} MATCHES "mobile")
+    include_directories(${CMAKE_SOURCE_DIR}/services/ZoomUI)
 endif (${PROFILE} MATCHES "mobile")
 
 include(FindPkgConfig)
@@ -62,11 +63,12 @@ add_dependencies(${PROJECT_NAME} QuickAccess)
 add_dependencies(${PROJECT_NAME} HistoryUI)
 add_dependencies(${PROJECT_NAME} TabUI)
 add_dependencies(${PROJECT_NAME} SettingsUI)
-add_dependencies(${PROJECT_NAME} ZoomUI)
 add_dependencies(${PROJECT_NAME} PlatformInputManager)
 add_dependencies(${PROJECT_NAME} CertificateService)
 if (${PROFILE} MATCHES "mobile")
     add_dependencies(${PROJECT_NAME} FindOnPageUI)
+else (${PROFILE} MATCHES "mobile")
+    add_dependencies(${PROJECT_NAME} ZoomUI)
 endif (${PROFILE} MATCHES "mobile")
 target_link_libraries(${PROJECT_NAME} WebPageUI)
 target_link_libraries(${PROJECT_NAME} StorageService)
@@ -80,11 +82,12 @@ target_link_libraries(${PROJECT_NAME} SettingsUI)
 target_link_libraries(${PROJECT_NAME} BookmarkDetailsUI)
 target_link_libraries(${PROJECT_NAME} BookmarkFlowUI)
 target_link_libraries(${PROJECT_NAME} BookmarkManagerUI)
-target_link_libraries(${PROJECT_NAME} ZoomUI)
 target_link_libraries(${PROJECT_NAME} PlatformInputManager)
 target_link_libraries(${PROJECT_NAME} CertificateService)
 if (${PROFILE} MATCHES "mobile")
     target_link_libraries(${PROJECT_NAME} FindOnPageUI)
+else (${PROFILE} MATCHES "mobile")
+    target_link_libraries(${PROJECT_NAME} ZoomUI)
 endif (${PROFILE} MATCHES "mobile")
 target_link_libraries(${PROJECT_NAME} ${EFL_LDFLAGS})
 

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index b3414ed07ecd136bb8b6587c070b1ebac070e61b..17e2ae9beb4c5f2bf501098253e16b07014458f8 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -280,16 +280,16 @@ void SimpleUI::loadUIServices()
         std::dynamic_pointer_cast
         <tizen_browser::base_ui::FindOnPageUI,tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.findonpageui"));
+#else
+    m_zoomUI =
+        std::dynamic_pointer_cast
+        <tizen_browser::base_ui::ZoomUI, tizen_browser::core::AbstractService>
+        (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.zoomui"));
 #endif
     m_bookmarkManagerUI =
         std::dynamic_pointer_cast
         <tizen_browser::base_ui::BookmarkManagerUI,tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.bookmarkmanagerui"));
-
-    m_zoomUI =
-        std::dynamic_pointer_cast
-        <tizen_browser::base_ui::ZoomUI, tizen_browser::core::AbstractService>
-        (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.zoomui"));
 }
 
 void SimpleUI::connectUISignals()
@@ -377,12 +377,13 @@ void SimpleUI::connectUISignals()
     m_moreMenuUI->switchToMobileMode.connect(boost::bind(&SimpleUI::switchToMobileMode, this));
     m_moreMenuUI->switchToDesktopMode.connect(boost::bind(&SimpleUI::switchToDesktopMode, this));
     m_moreMenuUI->isBookmark.connect(boost::bind(&SimpleUI::checkBookmark, this));
-    m_moreMenuUI->zoomUIClicked.connect(boost::bind(&SimpleUI::showZoomUI, this));
     m_moreMenuUI->bookmarkFlowClicked.connect(boost::bind(&SimpleUI::showBookmarkFlowUI, this, _1));
 #if PROFILE_MOBILE
     m_moreMenuUI->findOnPageClicked.connect(boost::bind(&SimpleUI::showFindOnPageUI, this));
     m_moreMenuUI->isRotated.connect(boost::bind(&SimpleUI::isLandscape, this));
     m_webPageUI->isLandscape.connect(boost::bind(&SimpleUI::isLandscape, this));
+#else
+    m_moreMenuUI->zoomUIClicked.connect(boost::bind(&SimpleUI::showZoomUI, this));
 #endif
 
     M_ASSERT(m_bookmarkDetailsUI.get());
@@ -414,12 +415,12 @@ void SimpleUI::connectUISignals()
 #if PROFILE_MOBILE
     m_bookmarkManagerUI->newFolderItemClicked.connect(boost::bind(&SimpleUI::onNewFolderClicked, this));
     m_bookmarkManagerUI->isLandscape.connect(boost::bind(&SimpleUI::isLandscape, this));
-#endif
-
+#else
     M_ASSERT(m_zoomUI.get());
     m_zoomUI->setZoom.connect(boost::bind(&SimpleUI::setZoomFactor, this, _1));
     m_zoomUI->getZoom.connect(boost::bind(&SimpleUI::getZoomFactor, this));
     m_zoomUI->scrollView.connect(boost::bind(&SimpleUI::scrollView, this, _1, _2));
+#endif
 }
 
 void SimpleUI::loadModelServices()
@@ -499,14 +500,14 @@ void SimpleUI::initUIServices()
 
     M_ASSERT(m_findOnPageUI.get());
     m_findOnPageUI->init(m_webPageUI->getContent());
+#else
+    M_ASSERT(m_zoomUI.get());
+    m_zoomUI->init(m_viewManager.getContent());
 #endif
 
     M_ASSERT(m_bookmarkManagerUI.get());
     m_bookmarkManagerUI->init(m_viewManager.getContent());
     m_bookmarkManagerUI->setFoldersId(m_storageService->getFoldersStorage().AllFolder, m_storageService->getFoldersStorage().SpecialFolder);
-
-    M_ASSERT(m_zoomUI.get());
-    m_zoomUI->init(m_viewManager.getContent());
 }
 
 void SimpleUI::initModelServices()
@@ -576,8 +577,8 @@ void SimpleUI::connectModelSignals()
 
     m_platformInputManager->returnPressed.connect(boost::bind(&elm_exit));
     m_platformInputManager->backPressed.connect(boost::bind(&SimpleUI::onBackPressed, this));
-    m_platformInputManager->escapePressed.connect(boost::bind(&SimpleUI::onEscapePressed, this));
 #if !PROFILE_MOBILE
+    m_platformInputManager->escapePressed.connect(boost::bind(&SimpleUI::onEscapePressed, this));
     m_platformInputManager->redPressed.connect(boost::bind(&SimpleUI::onRedKeyPressed, this));
     m_platformInputManager->yellowPressed.connect(boost::bind(&SimpleUI::onYellowKeyPressed, this));
 #endif
@@ -1040,13 +1041,13 @@ void SimpleUI::dismissPopup(interfaces::AbstractPopup* popup)
     }
 }
 
+#if !PROFILE_MOBILE
 void SimpleUI::onEscapePressed()
 {
     BROWSER_LOGD("[%s]", __func__);
     m_zoomUI->escapeZoom();
 }
-
-#if PROFILE_MOBILE
+#else
 void SimpleUI::onMenuButtonPressed()
 {
     BROWSER_LOGD("[%s]", __func__);
@@ -1248,14 +1249,6 @@ void SimpleUI::onYellowKeyPressed()
 {
     m_webPageUI->onYellowKeyPressed();
 }
-#endif
-
-void SimpleUI::webEngineURLChanged(const std::string url)
-{
-    BROWSER_LOGD("webEngineURLChanged:%s", url.c_str());
-    m_webPageUI->getURIEntry().clearFocus();
-    m_tabService->clearThumb(m_webEngine->currentTabId());
-}
 
 void SimpleUI::showZoomUI()
 {
@@ -1285,6 +1278,14 @@ int SimpleUI::getZoomFactor()
     BROWSER_LOGD("[%s:%d] %d", __PRETTY_FUNCTION__, __LINE__, m_webEngine->getZoomFactor());
     return m_webEngine->getZoomFactor();
 }
+#endif
+
+void SimpleUI::webEngineURLChanged(const std::string url)
+{
+    BROWSER_LOGD("webEngineURLChanged:%s", url.c_str());
+    m_webPageUI->getURIEntry().clearFocus();
+    m_tabService->clearThumb(m_webEngine->currentTabId());
+}
 
 void SimpleUI::scrollView(const int& dx, const int& dy)
 {

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index b31a915bf5954fcc03fd38541642a5942402849d..6d1bfd6f7df08c1a5da38ffb0af973c3b3b3eadf 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -43,11 +43,11 @@
 #include "TextPopup_mob.h"
 #else
 #include "SettingsUI.h"
+#include "ZoomUI.h"
 #endif
 #include "QuickAccess.h"
 #include "TabUI.h"
 #include "TabId.h"
-#include "ZoomUI.h"
 #include "HistoryService.h"
 #include "TabServiceTypedef.h"
 #include "BookmarkDetailsUI.h"
@@ -252,6 +252,7 @@ private:
      */
     void deleteBookmark(void);
 
+#if !PROFILE_MOBILE
     /**
      * @brief show Zoom Menu
      */
@@ -259,6 +260,7 @@ private:
     void closeZoomUI();
     void setZoomFactor(int level);
     int getZoomFactor();
+#endif
     void scrollView(const int& dx, const int& dy);
 
     void showTabUI();
@@ -318,12 +320,12 @@ private:
     void tabLimitPopupButtonClicked(PopupButtons button);
 #else
     void tabLimitPopupButtonClicked(PopupButtons button, std::shared_ptr< PopupData > /*popupData*/);
+    void onEscapePressed();
 #endif
     int tabsCount();
 
     void onReturnPressed(MenuButton *m);
     void onBackPressed();
-    void onEscapePressed();
 
     void searchWebPage(std::string &text, int flags);
 
@@ -341,6 +343,8 @@ private:
 #if PROFILE_MOBILE
     std::shared_ptr<BookmarkFlowUI> m_bookmarkFlowUI;
     std::shared_ptr<FindOnPageUI> m_findOnPageUI;
+#else
+    std::shared_ptr<tizen_browser::base_ui::ZoomUI> m_zoomUI;
 #endif
     std::shared_ptr<services::CertificateContents> m_certificateContents;
     std::shared_ptr<BookmarkManagerUI> m_bookmarkManagerUI;
@@ -351,7 +355,6 @@ private:
     std::shared_ptr<services::PlatformInputManager> m_platformInputManager;
     std::shared_ptr<services::StorageService> m_storageService;
     storage::Session m_currentSession;
-    std::shared_ptr<tizen_browser::base_ui::ZoomUI> m_zoomUI;
     bool m_initialised;
     int m_tabLimit;
     int m_favoritesLimit;

diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h
index 20d653606050e58e2c4f5f802320b81161331c33..fe07b781759946aae43cacba68da59dcf727c270 100644 (file)
--- a/services/WebPageUI/WebPageUI.h
+++ b/services/WebPageUI/WebPageUI.h
@@ -104,12 +104,13 @@ public:
 #if PROFILE_MOBILE
     boost::signals2::signal<void ()> hideMoreMenu;
     boost::signals2::signal<void ()> qaOrientationChanged;
+#else
+    boost::signals2::signal<void ()> showZoomNavigation;
 #endif
     boost::signals2::signal<void ()> showMoreMenu;
     boost::signals2::signal<void ()> hideQuickAccess;
     boost::signals2::signal<void ()> showQuickAccess;
     boost::signals2::signal<void ()> bookmarkManagerClicked;
-    boost::signals2::signal<void ()> showZoomNavigation;
 
 private:
     static void faviconClicked(void* data, Evas_Object* obj, const char* emission, const char* source);