Revert "Open page on visibility change state" 69/78569/2
authorHye Kyoung Hwang <cookie@samsung.com>
Wed, 6 Jul 2016 06:16:18 +0000 (23:16 -0700)
committerHye Kyoung Hwang <cookie@samsung.com>
Wed, 6 Jul 2016 06:17:12 +0000 (23:17 -0700)
This reverts commit 9209a5a99427574f862bd9a7553fdf30e2fde404.

Change-Id: I4787cbb4007df87c5d65e221b9c68b240279aeca

services/SimpleUI/SimpleUI.cpp
services/SimpleUI/SimpleUI.h

index 2cc5bb59e7ad4b63a68c7e336b418ba812a99049..d0e554bf057cb6a60ea535e729ccb3fa5937f7f0 100644 (file)
@@ -120,7 +120,6 @@ SimpleUI::SimpleUI()
     evas_object_smart_callback_add(m_viewManager.getConformant(), "virtualkeypad,state,on", onUrlIMEOpened, this);
     evas_object_smart_callback_add(m_viewManager.getConformant(), "virtualkeypad,state,off",onUrlIMEClosed, this);
 #endif
-    evas_object_smart_callback_add(main_window, "visibility,changed", _win_state_visibility_cb, this);
 }
 
 SimpleUI::~SimpleUI() {
@@ -164,16 +163,6 @@ std::shared_ptr<services::HistoryItemVector> SimpleUI::getHistory()
 {
     return m_historyService->getHistoryToday();
 }
-void SimpleUI::_win_state_visibility_cb(void *data, Evas_Object*, void*)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (!data)
-        return;
-    auto sui = static_cast<SimpleUI*>(data);
-    if (!sui->m_urlOnStart.empty())
-        sui->openNewTab(sui->m_urlOnStart);
-    sui->m_urlOnStart.clear();
-}
 
 int SimpleUI::exec(const std::string& _url, const std::string& _caller)
 {
@@ -186,6 +175,7 @@ int SimpleUI::exec(const std::string& _url, const std::string& _caller)
             m_tabLimit = boost::any_cast <int> (tizen_browser::config::Config::getInstance().get("TAB_LIMIT"));
             m_favoritesLimit = boost::any_cast <int> (tizen_browser::config::Config::getInstance().get("FAVORITES_LIMIT"));
 
+
             loadUIServices();
             loadModelServices();
 
@@ -212,7 +202,12 @@ int SimpleUI::exec(const std::string& _url, const std::string& _caller)
         }
         m_initialised = true;
     }
-    m_urlOnStart = url;
+
+    if (!url.empty())
+    {
+        BROWSER_LOGD("[%s]: open new tab", __func__);
+        openNewTab(url);
+    }
 
     BROWSER_LOGD("[%s]:%d url=%s", __func__, __LINE__, url.c_str());
     return 0;
index 1c9acfe7bab318a460c84769828f88bff816b2d2..9c7ccb690a083d54b8e95e8f7a05d184a1e362a7 100644 (file)
@@ -299,7 +299,6 @@ private:
     int getRotation();
     static void __orientation_changed(void* data, Evas_Object*, void*);
 #endif
-    static void _win_state_visibility_cb(void *data, Evas_Object*, void*);
     void closeBookmarkDetailsUI();
     void closeBookmarkManagerUI();
     void showBookmarkManagerUI();
@@ -367,7 +366,6 @@ private:
     int m_favoritesLimit;
     bool m_wvIMEStatus;
     std::string m_folder_name;
-    std::string m_urlOnStart;
 
     //helper object used to view management
     ViewManager m_viewManager;