summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyeKyoung Hwang <cookie@samsung.com>2016-10-28 14:43:08 +0900
committerHyeKyoung Hwang <cookie@samsung.com>2016-10-28 14:43:08 +0900
commit2bbd6cceb0b70faaa03c71c5a82623c40fce2c27 (patch)
treed253dbea5495a9b2248e17437b2345f26ae08b5b
parent152fb67a3f895acbba65541a8c81b413c32678e5 (diff)
downloadbrowser-2bbd6cceb0b70faaa03c71c5a82623c40fce2c27.tar.gz
browser-2bbd6cceb0b70faaa03c71c5a82623c40fce2c27.tar.bz2
browser-2bbd6cceb0b70faaa03c71c5a82623c40fce2c27.zip
Change-Id: I035aa3359d8c010ed779273f50d666c0fc712d07 Signed-off-by: HyeKyoung Hwang <cookie@samsung.com>
-rwxr-xr-x.gbs.conf35
-rwxr-xr-x[-rw-r--r--]services/SimpleUI/SimpleUI.cpp8
-rwxr-xr-x[-rw-r--r--]services/SimpleUI/SimpleUI.h2
-rwxr-xr-x[-rw-r--r--]services/WebEngineService/WebView.h4
4 files changed, 44 insertions, 5 deletions
diff --git a/.gbs.conf b/.gbs.conf
index 8125ce6d..1f0ce972 100755
--- a/.gbs.conf
+++ b/.gbs.conf
@@ -262,4 +262,39 @@ url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm64/packages
[repo.tzmo_v3.0_arm64-wayland]
url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm64-wayland/packages/
+###############################################
+# For Common #
+###############################################
+
+###############################################
+#
+# Tizen v3.0 for common (arm-wayland)
+# artik
+
+[profile.tizen_common_arm-wayland]
+repos = repo.base-arm,repo.common_arm-wayland
+
+[repo.base-arm]
+url=http://download.tizen.org/snapshots/tizen/base/latest/repos/arm/packages/
+
+[repo.common_arm-wayland]
+url=http://download.tizen.org/snapshots/tizen/common/latest/repos/arm-wayland/packages/
+
+
+###############################################
+#
+# Tizen v3.0 for common (arm-wayland), Mirroring Server for HQ developers
+# artik
+
+[profile.tizen_common_arm-wayland_mirror]
+obs = obs.tizen_v3.0
+repos = repo.base-arm_mirror,repo.common_arm-wayland_mirror
+buildroot = ~/GBS-ROOT-3.0-COMMON-ARTIK-arm-wayland
+user = blinkbot
+passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
+
+[repo.base-arm_mirror]
+url=http://165.213.149.200/download/public_mirror/tizen/base/latest/repos/arm/packages/
+[repo.common_arm-wayland_mirror]
+url=http://165.213.149.200/download/public_mirror/tizen/common/latest/repos/arm-wayland/packages/ \ No newline at end of file
diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index b83e559a..15dc7605 100644..100755
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -44,7 +44,9 @@
#include "DetailPopup.h"
#include "UrlHistoryList/UrlHistoryList.h"
#include "NotificationPopup.h"
+#if PROFILE_MOBILE
#include "ContentPopup_mob.h"
+#endif
#include "Tools/GeneralTools.h"
#include "Tools/SnapshotType.h"
@@ -573,11 +575,11 @@ void SimpleUI::connectModelSignals()
m_webEngine->createTabId.connect(boost::bind(&SimpleUI::onCreateTabId, this));
m_webEngine->snapshotCaptured.connect(boost::bind(&SimpleUI::onSnapshotCaptured, this, _1, _2));
m_webEngine->redirectedWebPage.connect(boost::bind(&SimpleUI::redirectedWebPage, this, _1, _2));
- m_webEngine->rotatePrepared.connect(boost::bind(&SimpleUI::rotatePrepared, this));
m_webEngine->switchToQuickAccess.connect(boost::bind(&SimpleUI::switchViewToQuickAccess, this));
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->rotatePrepared.connect(boost::bind(&SimpleUI::rotatePrepared, this));
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));
@@ -1126,7 +1128,7 @@ void SimpleUI::enableManualRotation(bool enable)
elm_win_wm_rotation_manual_rotation_done_set(main_window,
m_manualRotation ? EINA_TRUE : EINA_FALSE);
}
-
+#if PROFILE_MOBILE
void SimpleUI::rotatePrepared()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
@@ -1136,7 +1138,7 @@ void SimpleUI::rotatePrepared()
m_moreMenuUI->resetContent();
}
}
-
+#endif
void SimpleUI::onRotation()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index 276832a7..ab9a6596 100644..100755
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -62,7 +62,9 @@
#include "Action.h"
#include "InputPopup.h"
#include "SimplePopup.h"
+#if PROFILE_MOBILE
#include "ContentPopup_mob.h"
+#endif
#include "WebConfirmation.h"
#include "ViewManager.h"
#include "MenuButton.h"
diff --git a/services/WebEngineService/WebView.h b/services/WebEngineService/WebView.h
index 7074056f..9bedaabe 100644..100755
--- a/services/WebEngineService/WebView.h
+++ b/services/WebEngineService/WebView.h
@@ -283,9 +283,9 @@ public:
boost::signals2::signal<void ()> switchToWebPage;
boost::signals2::signal<void (const std::string&, const std::string&)> setCertificatePem;
boost::signals2::signal<void (const std::string&, const std::string&)> setWrongCertificatePem;
-
+#if PROFILE_MOBILE
boost::signals2::signal<void ()> rotatePrepared;
-
+#endif
boost::signals2::signal<void (const std::string&, const std::string&)> redirectedWebPage;
boost::signals2::signal<void()> unsecureConnection;
boost::signals2::signal<void(bool)> fullscreenModeSet;