Incognito Mode Add Tab button should open a new tab

[Issue] https://bugs.tizen.org/jira/browse/TT-221
[Problem] Incognito mode Add Tab button doesn't create new tab
[Solution] IncognitoMode always opens a new tab.
[Verification]
1) Open Tab Manager
2) Add Incognito Tab
3) Type url address and press Enter

2 -> New tab should be opened.
3 -> site should be opened in the current tab.

1) Open Tab Manager
2) Add Incognito Tab
3) Press BookmarkManager and click bookmark

3-> site should be opened in the current tab.

Change-Id: I7e2d98bbba1a2d5bc09afe8b4a4f5d055c2724c2

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index f3b6504..c86fd31 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -495,9 +495,8 @@ void SimpleUI::switchViewToIncognitoPage()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_viewManager);
-    m_webPageUI->toIncognito(m_incognito);
+    openNewTab("");
     m_webPageUI->switchViewToIncognitoPage();
-    m_webEngine->disconnectCurrentWebViewSignals();
     m_viewManager->popStackTo(m_webPageUI.get());
 }
 
@@ -593,12 +592,20 @@ void SimpleUI::onBookmarkClicked(std::shared_ptr<tizen_browser::services::Bookma
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_viewManager);
-    m_viewManager->popStackTo(m_webPageUI.get());
     std::string bookmarkAddress = bookmarkItem->getAddress();
-    openNewTab(bookmarkAddress);
+    m_viewManager->popStackTo(m_webPageUI.get());
+    if (!m_incognito) {
+        openNewTab(bookmarkAddress);
+    } else {
+        std::string bookmarkTitle = bookmarkItem->getTittle();
+        m_webPageUI->switchViewToWebPage(m_webEngine->getLayout(), bookmarkAddress, bookmarkTitle);
+        m_webEngine->setURI(bookmarkAddress);
+        m_webPageUI->setPageTitle(bookmarkTitle);
+        m_webPageUI->getURIEntry().clearFocus();
+        closeBookmarkManagerUI();
+    }
 }
 
-
 void SimpleUI::onHistoryRemoved(const std::string& uri)
 {
     BROWSER_LOGD("[%s] deleted %s", __func__, uri.c_str());
@@ -692,6 +699,9 @@ void SimpleUI::filterURL(const std::string& url)
             openNewTab(url);
         else
             m_webEngine->setURI(url);
+
+        if (m_incognito)
+            switchViewToWebPage();
     }
     m_webPageUI->getURIEntry().clearFocus();
 }

diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index 8e22e44..f617925 100644 (file)
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -172,7 +172,11 @@ void WebPageUI::switchViewToIncognitoPage()
     m_homePageActive = false;
     setMainContent(m_privateLayout);
     evas_object_show(m_leftButtonBar->getContent());
+    setPrivateButtons();
     refreshFocusChain();
+    m_URIEntry->changeUri("");
+    m_URIEntry->setPageTitle("Start Incognito Browsing");
+    m_URIEntry->setFocus();
 }
 
 void WebPageUI::switchViewToWebPage(Evas_Object* content, const std::string uri, const std::string title)
@@ -376,6 +380,15 @@ void WebPageUI::setErrorButtons()
     evas_object_hide(m_progressBar);
 }
 
+void WebPageUI::setPrivateButtons()
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    m_stopLoading->setEnabled(false);
+    m_reload->setEnabled(false);
+    m_forward->setEnabled(false);
+    evas_object_hide(m_progressBar);
+}
+
 void WebPageUI::updateURIBar(const std::string& uri)
 {
     BROWSER_LOGD("[%s:%d] URI:%s", __PRETTY_FUNCTION__, __LINE__, uri.c_str());

diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h
index 34b3717..a3e04f4 100644 (file)
--- a/services/WebPageUI/WebPageUI.h
+++ b/services/WebPageUI/WebPageUI.h
@@ -81,6 +81,7 @@ private:
     void hideProgressBar();
     void hideWebView();
     void setErrorButtons();
+    void setPrivateButtons();
     void setMainContent(Evas_Object* content);
     void updateURIBar(const std::string& uri);
     std::string edjePath(const std::string& file);