Merge lp:~ahayzen/webbrowser-app/dnd-tabs-001 into lp:webbrowser-app

[Andrew Hayzen]

WIP Drag and drop support

WIP Drag and drop support, proposing so that we can get debs easily.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1518
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/661/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1655/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1655
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1501/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1501/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1501/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1501/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1501/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1501/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1501/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1501/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1501/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/661/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/webbrowser-app/dnd-tabs-001]

1519. By Andrew Hayzen on 2016-09-29

* Fix reparenting by ensuring that QML context is not set to a window
* Changes to BrowserTab declaration so that properties can be set after creation
* Allow unit tests to run

1520. By Andrew Hayzen on 2016-09-30

* Add destruction code to repearenter so that it correctly destroys any contexts and objects left

1521. By Andrew Hayzen on 2016-09-30

* Change behaviour so if dropped in the bottom part of the browser window it generates a new window

1522. By Andrew Hayzen on 2016-09-30

* If dragging within the original window and Chrome when in multi-window drag, move tab delegate with mouse
* Move drag handle to bottom right of mouse instead of centred
* When dragging the tab delegate don't animate it

1523. By Andrew Hayzen on 2016-09-30

* Reenable animation when dragging as model moves depend on it

1524. By Andrew Hayzen on 2016-10-04

* Only allow tabs to be dragged to windows of the same incognito type

1525. By Andrew Hayzen on 2016-10-04

* Raise window when DropArea is entered
* Change styling of DropArea
* Add "Move to New Window" context item to tab delegates

1526. By Andrew Hayzen on 2016-10-10

* Add autopilot tests TestMultipleWindowsDrag to ensure that drag and drop functions correct in wide mode

1527. By Andrew Hayzen on 2016-10-10

* Merge of trunk

1528. By Andrew Hayzen on 2016-10-12

* Update autopilot tests to use new switch_to_unfocused_window which improves switching on unity7 env

1529. By Andrew Hayzen on 2016-10-13

* Add Reparenter unit tests

1530. By Andrew Hayzen on 2016-10-14

* Merge of lp:webbrowser-app/staging and resolve conflicts

1531. By Andrew Hayzen on 2016-10-14

* Fix for progress bar appearing after tab is dragged out

1532. By Andrew Hayzen on 2016-10-24

* Be more declarative in DropArea
* Change use of DropActions to make more sense
* Change unit test to use default timeout
* Allow setting of expectedAction in DragHelper
* Update uses of null to Q_NULLPTR
* Disable dragging on mir clients

1533. By Andrew Hayzen on 2016-10-24

* Limit y diff of visual tabitem when dragging

1534. By Andrew Hayzen on 2016-10-26

* Fix regression where new tabs have massive favicons

1535. By Andrew Hayzen on 2016-10-26

* Remove white shade on bottom part of browser to match design

1536. By Andrew Hayzen on 2016-10-27

* Revert change in use of DropAction as dropping outside of a DropArea is always IgnoreAction
* Change test_drag_tab_outside_new_window to move the tab below the window
* Change property tabsBarHeight to be real rather than int

1537. By Andrew Hayzen on 2016-10-27

* Revert .pot changes

1538. By Andrew Hayzen on 2016-10-27

* Revert changes to test as it was fine before :-)

1539. By Andrew Hayzen on 2016-11-08

* Remove referenes to browser, tabModel and windo in TabsBar.qml
* Remove reference to builder in Browser.qml
* Allowed passing of properties to Reparenter::createObject()
* Made Reparenter a singleton
* Moved buildContextProperties() and createTabHelper() into internal to make them private
* Change dropArea.heightThreshold to be real not int
* Removed many console.debug() calls
* Changes includes to be fully-qualified in drag-helper and reparenter
* Renamed closeMethod to callback for newWindowFromTab()

1540. By Andrew Hayzen on 2016-11-08

* Ensure that switchToTab is called after binding a new tab, otherwise the chrome's position can be broken

1541. By Andrew Hayzen on 2016-11-08

* Merge of lp:webbrowser-app/staging

1542. By Andrew Hayzen on 2016-11-08

* Update dropArea shade to match new design
* Fix for bad conflict resolution

1543. By Andrew Hayzen on 2016-11-08

* Fix for typo

1544. By Andrew Hayzen on 2016-11-10

* Add .dragging property to DragHelper so that drop area shade knows when a drag event is occuring
* Change DragHelper to a singleton

1545. By Andrew Hayzen on 2016-11-18

* Changed DragHelper to be a QObject and use member initialisation
* Changed Reparenter::createObject to use beginCreate and completeCreate
* Various fixes to reduce warnings under QML tests

1546. By Andrew Hayzen on 2016-11-18

* Use forward declaration of QQuickItem

1547. By Andrew Hayzen on 2016-11-18

* Fix for missed case of createTabHelper -> createTab

1548. By Andrew Hayzen on 2016-11-22

* Ensure webviews are not shown when newTabView is active

1549. By Andrew Hayzen on 2016-11-22

* Change keyboard shortcuts to use contentsContainer visibility instead of tabsContainer

1550. By Andrew Hayzen on 2016-11-24

* Use enabled rather than visible on the tabContainer to prevent events being stolen, otherwise chrome disappears when opening new tabs as the locationBarController.offset doesn't get set

1551. By Andrew Hayzen on 2016-11-25

* Before tab is closed, check if a new tab needs to be generated as the context will disappear

1552. By Andrew Hayzen on 2016-11-28

* Use deleteLater rather than delete item; otherwise on slower devices such as phones it crashes
* Don't delete the context if it was not removed from the reparenter context store
* Change qml test for reparenter to respect that the delete may take time to happen

Unmerged revisions

=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
--- src/Ubuntu/Web/UbuntuWebContext.qml	2016-06-14 18:49:01 +0000
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2016-09-28 15:27:35 +0000
@@ -70,13 +70,16 @@
     ]
 
     property QtObject __ua: UserAgent02 {
-        onSmallScreenChanged: reloadOverrides()
+        onScreenSizeChanged: reloadOverrides()
         Component.onCompleted: reloadOverrides()
 
         property string _target: ""
 
         function reloadOverrides() {
-            var target = smallScreen ? "mobile" : "desktop"
+            if (screenSize === "unknown") {
+                return
+            }
+            var target = screenSize === "small" ? "mobile" : "desktop"
             if (target == _target) return
             _target = target
             var script = "ua-overrides-%1.js".arg(target)

=== modified file 'src/Ubuntu/Web/UserAgent02.qml'
--- src/Ubuntu/Web/UserAgent02.qml	2016-06-03 08:08:45 +0000
+++ src/Ubuntu/Web/UserAgent02.qml	2016-09-28 15:27:35 +0000
@@ -31,7 +31,7 @@
 QtObject {
     // Empirical value: screens smaller than 19cm are considered small enough that a
     // mobile UA string is used, screens bigger than that will get desktop content.
-    readonly property bool smallScreen: screenDiagonal < 190
+    readonly property string screenSize: (screenDiagonal === 0) ? "unknown" : (screenDiagonal > 0 && screenDiagonal < 190) ? "small" : "large"
 
     // %1: Ubuntu version, e.g. "14.04"
     // %2: optional token to specify further attributes of the platform, e.g. "like Android"
@@ -48,7 +48,7 @@
     //   difference in the content served by certain sites (e.g. gmail.com)
     readonly property string _template: "Mozilla/5.0 (Linux; Ubuntu %1%2%3) AppleWebKit/%4 Chromium/%5 %6Safari/%7%8"
 
-    readonly property string _attributes: smallScreen ? "like Android 4.4" : ""
+    readonly property string _attributes: screenSize === "small" ? "like Android 4.4" : ""
 
     readonly property string _hardwareID: ""
 
@@ -57,7 +57,7 @@
 
     readonly property string _chromiumVersion: Oxide.chromiumVersion
 
-    readonly property string _formFactor: smallScreen ? "Mobile" : ""
+    readonly property string _formFactor: screenSize === "small" ? "Mobile" : ""
 
     readonly property string _more: ""
 

=== modified file 'src/app/BrowserView.qml'
--- src/app/BrowserView.qml	2016-06-16 18:21:58 +0000
+++ src/app/BrowserView.qml	2016-09-28 15:27:35 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.4
+import QtQuick.Window 2.2
 import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 import com.canonical.Oxide 1.15 as Oxide
@@ -27,16 +28,12 @@
     property var currentWebview: null
     property string title: currentWebview ? currentWebview.title : ""
 
-    property var initialUrls
-
-    property var webbrowserWindow: null
-
     property var osk: _osk
 
     property bool hasTouchScreen: false
 
     // See http://design.canonical.com/2015/05/to-converge-onto-mobile-tablet-and-desktop-think-grid-units/
-    readonly property bool wide: width >= units.gu(90)
+    readonly property bool wide: Window.contentItem.width >= units.gu(90)
 
     focus: true
 

=== modified file 'src/app/BrowserWindow.qml'
--- src/app/BrowserWindow.qml	2016-05-25 15:46:41 +0000
+++ src/app/BrowserWindow.qml	2016-09-28 15:27:35 +0000
@@ -28,8 +28,6 @@
     property var currentWebview: null
     property bool hasTouchScreen: false
 
-    signal openUrls(var urls)
-
     contentOrientation: Screen.orientation
 
     minimumWidth: units.gu(50)
@@ -58,15 +56,4 @@
             }
         }
     }
-
-    // Handle runtime requests to open urls as defined
-    // by the freedesktop application dbus interface's open
-    // method for DBUS application activation:
-    // http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
-    // The dispatch on the org.freedesktop.Application if is done per appId at the
-    // url-dispatcher/upstart level.
-    Connections {
-        target: UriHandler
-        onOpened: window.openUrls(uris)
-    }
 }

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2016-04-12 19:59:00 +0000
+++ src/app/CMakeLists.txt	2016-09-28 15:27:35 +0000
@@ -26,7 +26,6 @@
     mime-database.cpp
     session-storage.cpp
     single-instance-manager.cpp
-    webbrowser-window.cpp
     qquickshortcut.cpp
 )
 

=== added file 'src/app/actions/OpenLinkInNewWindow.qml'
--- src/app/actions/OpenLinkInNewWindow.qml	1970-01-01 00:00:00 +0000
+++ src/app/actions/OpenLinkInNewWindow.qml	2016-09-28 15:27:35 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open link in new window")
+}

=== added file 'src/app/actions/OpenLinkInPrivateWindow.qml'
--- src/app/actions/OpenLinkInPrivateWindow.qml	1970-01-01 00:00:00 +0000
+++ src/app/actions/OpenLinkInPrivateWindow.qml	2016-09-28 15:27:35 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open link in private window")
+}

=== modified file 'src/app/browserapplication.cpp'
--- src/app/browserapplication.cpp	2016-06-16 13:30:01 +0000
+++ src/app/browserapplication.cpp	2016-09-28 15:27:35 +0000
@@ -29,8 +29,8 @@
 #include <QtQml/QQmlComponent>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
+#include <QtQml/QQmlProperty>
 #include <QtQml/QtQml>
-#include <QtQuick/QQuickWindow>
 
 // local
 #include "browserapplication.h"
@@ -40,16 +40,14 @@
 #include "mime-database.h"
 #include "qquickshortcut_p.h"
 #include "session-storage.h"
-#include "webbrowser-window.h"
 
 #include "Unity/InputInfo/qdeclarativeinputdevicemodel_p.h"
 
 BrowserApplication::BrowserApplication(int& argc, char** argv)
     : QApplication(argc, argv)
     , m_engine(0)
-    , m_window(0)
     , m_component(0)
-    , m_webbrowserWindowProxy(0)
+    , m_object(nullptr)
 {
     m_arguments = arguments();
     m_arguments.removeFirst();
@@ -57,11 +55,7 @@
 
 BrowserApplication::~BrowserApplication()
 {
-    if (m_webbrowserWindowProxy) {
-        m_webbrowserWindowProxy->setWindow(NULL);
-    }
-    delete m_window;
-    delete m_webbrowserWindowProxy;
+    delete m_object;
     delete m_component;
     delete m_engine;
 }
@@ -108,7 +102,7 @@
 bool BrowserApplication::initialize(const QString& qmlFileSubPath
                                     , const QString& appId)
 {
-    Q_ASSERT(m_window == 0);
+    Q_ASSERT(m_object == nullptr);
 
     if (helpRequested()) {
         printUsage();
@@ -195,7 +189,6 @@
     if (!isRunningInstalled()) {
         m_engine->addImportPath(UbuntuBrowserImportsDirectory());
     }
-
     qmlEngineCreated(m_engine);
 
     QQmlContext* context = m_engine->rootContext();
@@ -208,15 +201,10 @@
         qWarning() << m_component->errorString();
         return false;
     }
-    m_webbrowserWindowProxy = new WebBrowserWindow();
-    context->setContextProperty("webbrowserWindowProxy", m_webbrowserWindowProxy);
-
-    QObject* browser = m_component->beginCreate(context);
-    m_window = qobject_cast<QQuickWindow*>(browser);
-    m_webbrowserWindowProxy->setWindow(m_window);
-
-    browser->setProperty("developerExtrasEnabled", inspectorEnabled);
-    browser->setProperty("forceFullscreen", m_arguments.contains("--fullscreen"));
+
+    m_object = m_component->beginCreate(context);
+
+    QQmlProperty::write(m_object, QStringLiteral("developerExtrasEnabled"), inspectorEnabled);
 
     bool hasTouchScreen = false;
     Q_FOREACH(const QTouchDevice* device, QTouchDevice::devices()) {
@@ -224,40 +212,17 @@
             hasTouchScreen = true;
         }
     }
-    browser->setProperty("hasTouchScreen", hasTouchScreen);
+    QQmlProperty::write(m_object, QStringLiteral("hasTouchScreen"), hasTouchScreen);
 
     return true;
 }
 
-void BrowserApplication::onNewInstanceLaunched(const QStringList& arguments) const
-{
-    QVariantList urls;
-    Q_FOREACH(const QString& argument, arguments) {
-        if (!argument.startsWith(QStringLiteral("-"))) {
-            QUrl url = QUrl::fromUserInput(argument);
-            if (url.isValid()) {
-                urls.append(url);
-            }
-        }
-    }
-    QMetaObject::invokeMethod(m_window, "openUrls", Q_ARG(QVariant, QVariant(urls)));
-    m_window->requestActivate();
-}
-
 void BrowserApplication::qmlEngineCreated(QQmlEngine*)
 {}
 
 int BrowserApplication::run()
 {
-    Q_ASSERT(m_window != 0);
-
-    if (m_arguments.contains("--fullscreen")) {
-        m_window->showFullScreen();
-    } else if (m_arguments.contains("--maximized")) {
-        m_window->showMaximized();
-    } else {
-        m_window->show();
-    }
+    Q_ASSERT(m_object != nullptr);
     return exec();
 }
 

=== modified file 'src/app/browserapplication.h'
--- src/app/browserapplication.h	2016-06-16 13:30:01 +0000
+++ src/app/browserapplication.h	2016-09-28 15:27:35 +0000
@@ -31,8 +31,6 @@
 
 class QQmlComponent;
 class QQmlEngine;
-class QQuickWindow;
-class WebBrowserWindow;
 
 // We want the browser to be QApplication based rather than QGuiApplication
 // to provide a widget based file picker on the desktop, rather than the
@@ -58,18 +56,16 @@
 
     QStringList m_arguments;
     QQmlEngine* m_engine;
-    QQuickWindow* m_window;
     QQmlComponent* m_component;
+    QObject* m_object;
 
-private Q_SLOTS:
-    void onNewInstanceLaunched(const QStringList& arguments) const;
+protected Q_SLOTS:
+    virtual void onNewInstanceLaunched(const QStringList& arguments) const = 0;
 
 private:
     QString inspectorPort() const;
     QString inspectorHost() const;
 
-    WebBrowserWindow *m_webbrowserWindowProxy;
-
     SingleInstanceManager m_singleton;
 };
 

=== removed file 'src/app/webbrowser-window.cpp'
--- src/app/webbrowser-window.cpp	2013-09-14 13:49:29 +0000
+++ src/app/webbrowser-window.cpp	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QDebug>
-#include "webbrowser-window.h"
-
-
-WebBrowserWindow::WebBrowserWindow(QObject *parent) :
-    QObject(parent),
-    _window(0)
-{}
-
-QQuickWindow * WebBrowserWindow::window() const
-{
-    return _window;
-}
-
-void WebBrowserWindow::setWindow(QQuickWindow * window)
-{
-    if (_window != window)
-    {
-        _window = window;
-        Q_EMIT windowChanged(window);
-    }
-}
-
-void WebBrowserWindow::raise()
-{
-    if ( ! _window)
-        return;
-
-    _window->raise();
-    _window->show();
-}
-
-

=== removed file 'src/app/webbrowser-window.h'
--- src/app/webbrowser-window.h	2013-09-14 13:49:29 +0000
+++ src/app/webbrowser-window.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __WEBBROWSER_WINDOW_H__
-#define __WEBBROWSER_WINDOW_H__
-
-#include <QObject>
-#include <QQuickWindow>
-
-
-class WebBrowserWindow : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QQuickWindow *window READ window WRITE setWindow NOTIFY windowChanged)
-
-
-public:
-    explicit WebBrowserWindow(QObject *parent = 0);
-
-
-    QQuickWindow * window() const;
-    void setWindow(QQuickWindow *);
-
-
-public slots:
-
-    void raise();
-
-
-signals:
-
-    void windowChanged(QQuickWindow *);
-
-
-private:
-
-    QQuickWindow * _window;
-};
-
-
-#endif // __WEBBROWSER_WINDOW_H__
-

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-07-01 08:52:37 +0000
+++ src/app/webbrowser/Browser.qml	2016-09-28 15:27:35 +0000
@@ -38,30 +38,50 @@
     // Should be true when the containing window is fullscreen.
     property bool fullscreen: false
 
+    property Settings settings
+
     currentWebview: tabsModel && tabsModel.currentTab ? tabsModel.currentTab.webview : null
 
-    readonly property var downloadManager: (downloadHandlerLoader.status == Loader.Ready) ? downloadHandlerLoader.item : null
-
-    property bool newSession: false
-
     property bool incognito: false
 
-    readonly property var tabsModel: incognito ? privateTabsModelLoader.item : publicTabsModel
-
-    // Restore only the n most recent tabs at startup,
-    // to limit the overhead of instantiating too many
-    // tab objects (see http://pad.lv/1376433).
-    readonly property int maxTabsToRestore: 10
-
-    onTabsModelChanged: {
-        if (incognito && privateTabsModelLoader.item) {
-            browser.openUrlInNewTab("", true)
-        } else if (!incognito && tabsModel.currentTab) {
-            // If the system is low on memory, the current public tab might
-            // have been unloaded while browsing incognito, so reload it.
-            tabsModel.currentTab.load()
-        }
-    }
+    property var tabsModel: TabsModel {}
+
+    function serializeTabState(tab) {
+        var state = {}
+        state.uniqueId = tab.uniqueId
+        state.url = tab.url.toString()
+        state.title = tab.title
+        state.icon = tab.icon.toString()
+        state.preview = tab.preview.toString()
+        state.savedState = tab.webview ? tab.webview.currentState : tab.restoreState
+        return state
+    }
+
+    function restoreTabState(state) {
+        var properties = {'initialUrl': state.url, 'initialTitle': state.title,
+                          'uniqueId': state.uniqueId, 'initialIcon': state.icon,
+                          'preview': state.preview, 'restoreState': state.savedState,
+                          'restoreType': Oxide.WebView.RestoreLastSessionExitedCleanly}
+        return createTab(properties)
+    }
+
+    function createTab(properties) {
+        return tabComponent.createObject(tabContainer, properties)
+    }
+    
+    function bindExistingTab(tab) {
+        reparenter.reparent(tab, tabContainer);
+        
+        tab.current = tabsModel && tabsModel.currentTab === tab;
+        tab.focus = tab.current;
+        
+        tab.webview.currentWebview = browser.currentWebview;
+        tab.webview.filePicker = filePickerLoader.item;
+    }
+
+    signal newWindowRequested(bool incognito)
+    signal newWindowFromTab(var tab, var closeMethod)
+    signal openLinkInWindowRequested(url url, bool incognito)
 
     Connections {
         target: currentWebview
@@ -112,7 +132,7 @@
 
     Component {
         id: mediaAccessDialogComponent
-        MediaAccessDialog { }
+        MediaAccessDialog {}
     }
 
     actions: [
@@ -136,7 +156,7 @@
             onTriggered: internal.addBookmark(currentWebview.url, currentWebview.title, currentWebview.icon)
         },
         Actions.NewTab {
-            onTriggered: browser.openUrlInNewTab("", true)
+            onTriggered: internal.openUrlInNewTab("", true)
         },
         Actions.ClearHistory {
             onTriggered: HistoryModel.clearAll()
@@ -150,37 +170,6 @@
         }
     ]
 
-    Settings {
-        id: settings
-
-        property url homepage: settingsDefaults.homepage
-        property string searchEngine: settingsDefaults.searchEngine
-        property bool restoreSession: settingsDefaults.restoreSession
-        property int newTabDefaultSection: settingsDefaults.newTabDefaultSection
-        property string defaultAudioDevice
-        property string defaultVideoDevice
-
-        function restoreDefaults() {
-            homepage  = settingsDefaults.homepage
-            searchEngine = settingsDefaults.searchEngine
-            restoreSession = settingsDefaults.restoreSession
-            newTabDefaultSection = settingsDefaults.newTabDefaultSection
-            defaultAudioDevice = settingsDefaults.defaultAudioDevice
-            defaultVideoDevice = settingsDefaults.defaultVideoDevice
-        }
-    }
-
-    QtObject {
-        id: settingsDefaults
-
-        readonly property url homepage: "http://start.ubuntu.com"
-        readonly property string searchEngine: "google"
-        readonly property bool restoreSession: true
-        readonly property int newTabDefaultSection: 0
-        readonly property string defaultAudioDevice: ""
-        readonly property string defaultVideoDevice: ""
-    }
-
     FocusScope {
         id: contentsContainer
         anchors.fill: parent
@@ -465,7 +454,7 @@
 
                 onClicked: {
                     recentView.reset()
-                    browser.openUrlInNewTab("", true)
+                    internal.openUrlInNewTab("", true)
                 }
             }
         }
@@ -539,7 +528,7 @@
         }
 
         onSwitchToTab: internal.switchToTab(index, true)
-        onRequestNewTab: browser.openUrlInNewTab("", makeCurrent, true, index)
+        onRequestNewTab: internal.openUrlInNewTab("", makeCurrent, true, index)
         onTabClosed: internal.closeTab(index)
 
         onFindInPageModeChanged: {
@@ -554,6 +543,18 @@
 
         drawerActions: [
             Action {
+                objectName: "newwindow"
+                text: i18n.tr("New window")
+                iconName: "browser-tabs"
+                onTriggered: browser.newWindowRequested(false)
+            },
+            Action {
+                objectName: "newprivatewindow"
+                text: i18n.tr("New private window")
+                iconName: "private-browsing"
+                onTriggered: browser.newWindowRequested(true)
+            },
+            Action {
                 objectName: "share"
                 text: i18n.tr("Share")
                 iconName: "share"
@@ -588,24 +589,6 @@
                 onTriggered: downloadsViewLoader.active = true
             },
             Action {
-                objectName: "privatemode"
-                text: browser.incognito ? i18n.tr("Leave Private Mode") : i18n.tr("Private Mode")
-                iconName: "private-browsing"
-                iconSource: browser.incognito ? Qt.resolvedUrl("assets/private-browsing-exit.svg") : ""
-                onTriggered: {
-                    if (browser.incognito) {
-                        if (tabsModel.count > 1) {
-                            PopupUtils.open(leavePrivateModeDialog)
-                        } else {
-                            browser.incognito = false
-                            internal.resetFocus()
-                        }
-                    } else {
-                        browser.incognito = true
-                    }
-                }
-            },
-            Action {
                 objectName: "settings"
                 text: i18n.tr("Settings")
                 iconName: "settings"
@@ -842,12 +825,12 @@
             target: bookmarksViewLoader.item
 
             onBookmarkEntryClicked: {
-                browser.openUrlInNewTab(url, true)
+                internal.openUrlInNewTab(url, true)
                 bookmarksViewLoader.active = false
             }
             onBack: bookmarksViewLoader.active = false
             onNewTabClicked: {
-                browser.openUrlInNewTab("", true)
+                internal.openUrlInNewTab("", true)
                 bookmarksViewLoader.active = false
             }
         }
@@ -907,7 +890,7 @@
                         expandedHistoryViewLoader.model = model
                         expandedHistoryViewLoader.active = true
                     }
-                    onNewTabRequested: browser.openUrlInNewTab("", true)
+                    onNewTabRequested: internal.openUrlInNewTab("", true)
                     onBack: historyViewLoader.active = false
                 }
 
@@ -922,7 +905,7 @@
                         focus: true
                         model: expandedHistoryViewLoader.model
                         onHistoryEntryClicked: {
-                            browser.openUrlInNewTab(url, true)
+                            internal.openUrlInNewTab(url, true)
                             historyViewLoader.active = false
                         }
                         onHistoryEntryRemoved: {
@@ -946,11 +929,11 @@
 
                 onHistoryEntryClicked: {
                     historyViewLoader.active = false
-                    browser.openUrlInNewTab(url, true)
+                    internal.openUrlInNewTab(url, true)
                 }
                 onNewTabRequested: {
                     historyViewLoader.active = false
-                    browser.openUrlInNewTab("", true)
+                    internal.openUrlInNewTab("", true)
                 }
                 onDone: {
                     historyViewLoader.active = false
@@ -993,7 +976,7 @@
         Binding {
             target: downloadsViewLoader.item
             property: "downloadManager"
-            value: browser.downloadManager
+            value: downloadHandlerLoader.item
         }
         Binding {
             target: downloadsViewLoader.item
@@ -1014,31 +997,6 @@
         }
     }
 
-    TabsModel {
-        id: publicTabsModel
-    }
-
-    Loader {
-        id: privateTabsModelLoader
-
-        sourceComponent: browser.incognito ? privateTabsModelComponent : undefined
-
-        Component {
-            id: privateTabsModelComponent
-
-            TabsModel {
-                Component.onDestruction: {
-                    while (count > 0) {
-                        var tab = remove(count - 1)
-                        if (tab) {
-                            tab.close()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     Loader {
         id: downloadHandlerLoader
         source: "DownloadHandler.qml"
@@ -1050,6 +1008,7 @@
 
         BrowserTab {
             anchors.fill: parent
+            incognito: browser.incognito
             current: tabsModel && tabsModel.currentTab === this
             focus: current
 
@@ -1068,6 +1027,7 @@
                 filePicker: filePickerLoader.item
 
                 anchors.fill: parent
+
                 focus: true
 
                 enabled: current && !bottomEdgeHandle.dragging && !recentView.visible
@@ -1086,12 +1046,22 @@
                     Actions.OpenLinkInNewTab {
                         objectName: "OpenLinkInNewTabContextualAction"
                         enabled: contextModel && contextModel.linkUrl.toString()
-                        onTriggered: browser.openUrlInNewTab(contextModel.linkUrl, true)
+                        onTriggered: internal.openUrlInNewTab(contextModel.linkUrl, true)
                     }
                     Actions.OpenLinkInNewBackgroundTab {
                         objectName: "OpenLinkInNewBackgroundTabContextualAction"
                         enabled: contextModel && contextModel.linkUrl.toString()
-                        onTriggered: browser.openUrlInNewTab(contextModel.linkUrl, false)
+                        onTriggered: internal.openUrlInNewTab(contextModel.linkUrl, false)
+                    }
+                    Actions.OpenLinkInNewWindow {
+                        objectName: "OpenLinkInNewWindowContextualAction"
+                        enabled: contextModel && contextModel.linkUrl.toString()
+                        onTriggered: browser.openLinkInWindowRequested(contextModel.linkUrl, false)
+                    }
+                    Actions.OpenLinkInPrivateWindow {
+                        objectName: "OpenLinkInPrivateWindowContextualAction"
+                        enabled: contextModel && contextModel.linkUrl.toString()
+                        onTriggered: browser.openLinkInWindowRequested(contextModel.linkUrl, true)
                     }
                     Actions.BookmarkLink {
                         objectName: "BookmarkLinkContextualAction"
@@ -1134,7 +1104,7 @@
                         enabled: contextModel &&
                                  (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
                                  contextModel.srcUrl.toString()
-                        onTriggered: browser.openUrlInNewTab(contextModel.srcUrl, true)
+                        onTriggered: internal.openUrlInNewTab(contextModel.srcUrl, true)
                     }
                     Actions.CopyImage {
                         objectName: "CopyImageContextualAction"
@@ -1156,7 +1126,7 @@
                         enabled: contextModel &&
                                  (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) &&
                                  contextModel.srcUrl.toString()
-                        onTriggered: browser.openUrlInNewTab(contextModel.srcUrl, true)
+                        onTriggered: internal.openUrlInNewTab(contextModel.srcUrl, true)
                     }
                     Actions.SaveVideo {
                         objectName: "SaveVideoContextualAction"
@@ -1244,7 +1214,7 @@
                 contextMenu: browser.wide ? contextMenuWideComponent : contextMenuNarrowComponent
 
                 onNewViewRequested: {
-                    var tab = tabComponent.createObject(tabContainer, {"request": request, 'incognito': browser.incognito})
+                    var tab = tabComponent.createObject(tabContainer, {"request": request})
                     var setCurrent = (request.disposition == Oxide.NewViewRequest.DispositionNewForegroundTab)
                     internal.addTab(tab, setCurrent)
                     if (setCurrent) tabContainer.forceActiveFocus()
@@ -1263,7 +1233,7 @@
                             tab.close()
                         }
                         if (tabsModel.count === 0) {
-                            browser.openUrlInNewTab("", true, true)
+                            internal.openUrlInNewTab("", true, true)
                         }
                     }
                 }
@@ -1480,15 +1450,6 @@
             }
         }
 
-        function getOpenPages() {
-            var urls = []
-            for (var i = 0; i < tabsModel.count; i++) {
-                var url = tabsModel.get(i).url
-                if (url.toString()) urls.push(url) // exclude "new tab" tabs
-            }
-            return urls
-        }
-
         function instantiateShareComponent() {
             var component = Qt.createComponent("../Share.qml")
             if (component.status == Component.Ready) {
@@ -1509,6 +1470,18 @@
             if (share) share.shareText(text)
         }
 
+        function openUrlInNewTab(url, setCurrent, load, index) {
+            load = typeof load !== 'undefined' ? load : true
+            var tab = tabComponent.createObject(tabContainer, {"initialUrl": url})
+            addTab(tab, setCurrent, index)
+            if (load) {
+                tab.load()
+            }
+            if (!url.toString()) {
+                maybeFocusAddressBar()
+            }
+        }
+
         function addTab(tab, setCurrent, index) {
             if (index === undefined) index = tabsModel.add(tab)
             else index = tabsModel.insert(tab, index)
@@ -1519,23 +1492,22 @@
         }
 
         function closeTab(index) {
-            // Save the incognito state before removing the tab, because
-            // removing the last tab in the model will switch out incognito
-            // mode, thus causing the check below to fail and save the tab
-            // into the undo stack when it should be forgotten instead.
-            var wasIncognito = incognito
-            var tab = tabsModel.remove(index)
+            var tab = tabsModel.get(index)
             if (tab) {
-                if (!wasIncognito && tab.url.toString().length > 0) {
+                if (!incognito && tab.url.toString().length > 0) {
                     closedTabHistory.push({
-                        state: session.serializeTabState(tab),
+                        state: serializeTabState(tab),
                         index: index
                     })
                 }
                 tab.close()
             }
+            tabsModel.remove(index)
+            if (tabsModel.currentTab) {
+                tabsModel.currentTab.load()
+            }
             if (tabsModel.count === 0) {
-                browser.openUrlInNewTab("", true)
+                internal.openUrlInNewTab("", true)
                 recentView.reset()
             }
         }
@@ -1549,7 +1521,7 @@
         function undoCloseTab() {
             if (!incognito && closedTabHistory.length > 0) {
                 var tabInfo = closedTabHistory.pop()
-                var tab = session.createTabFromState(tabInfo.state)
+                var tab = restoreTabState(tabInfo.state)
                 addTab(tab, true, tabInfo.index)
             }
         }
@@ -1601,7 +1573,7 @@
                 if (!browser.currentWebview.url.toString()) {
                     internal.maybeFocusAddressBar()
                 } else {
-                    contentsContainer.forceActiveFocus()
+                    contentsContainer.focus = true;
                 }
             }
         }
@@ -1672,296 +1644,12 @@
         onTriggered: internal.switchToTab(internal.nextTabIndex, false)
     }
 
-    function openUrlInNewTab(url, setCurrent, load, index) {
-        load = typeof load !== 'undefined' ? load : true
-        var tab = tabComponent.createObject(tabContainer, {"initialUrl": url, 'incognito': browser.incognito})
-        internal.addTab(tab, setCurrent, index)
-        if (load) {
-            tab.load()
-        }
-        if (!url.toString()) {
-            internal.maybeFocusAddressBar()
-        }
-    }
-
-    SessionStorage {
-        id: session
-
-        dataFile: dataLocation + "/session.json"
-
-        function save() {
-            if (!locked) {
-                return
-            }
-            var tabs = []
-            for (var i = 0; i < publicTabsModel.count; ++i) {
-                var tab = publicTabsModel.get(i)
-                tabs.push(serializeTabState(tab))
-            }
-            store(JSON.stringify({tabs: tabs, currentIndex: publicTabsModel.currentIndex}))
-        }
-
-        property bool restoring: false
-        function restore() {
-            restoring = true
-            _doRestore()
-            restoring = false
-        }
-        function _doRestore() {
-            if (!locked) {
-                return
-            }
-            var state = null
-            try {
-                state = JSON.parse(retrieve())
-            } catch (e) {
-                return
-            }
-            if (state) {
-                var tabs = state.tabs
-                if (tabs) {
-                    for (var i = 0; i < Math.min(tabs.length, browser.maxTabsToRestore); ++i) {
-                        var tab = createTabFromState(tabs[i])
-                        internal.addTab(tab, false)
-                    }
-                }
-                if ('currentIndex' in state) {
-                    internal.switchToTab(state.currentIndex, false)
-                }
-            }
-        }
-
-        // Those two functions are used to save/restore the current state of a tab.
-        function serializeTabState(tab) {
-            var state = {}
-            state.uniqueId = tab.uniqueId
-            state.url = tab.url.toString()
-            state.title = tab.title
-            state.icon = tab.icon.toString()
-            state.preview = tab.preview.toString()
-            state.savedState = tab.webview ? tab.webview.currentState : tab.restoreState
-            return state
-        }
-
-        function createTabFromState(state) {
-            var properties = {'initialUrl': state.url, 'initialTitle': state.title}
-            if ('uniqueId' in state) {
-                properties["uniqueId"] = state.uniqueId
-            }
-            if ('icon' in state) {
-                properties["initialIcon"] = state.icon
-            }
-            if ('preview' in state) {
-                properties["preview"] = state.preview
-            }
-            if ('savedState' in state) {
-                properties['restoreState'] = state.savedState
-                properties['restoreType'] = Oxide.WebView.RestoreLastSessionExitedCleanly
-            }
-            return tabComponent.createObject(tabContainer, properties)
-        }
-    }
-    Timer {
-        id: delayedSessionSaver
-        interval: 500
-        onTriggered: session.save()
-    }
-    Timer {
-        // Save session periodically to mitigate state loss when the application crashes
-        interval: 60000 // every minute
-        repeat: true
-        running: !browser.incognito
-        onTriggered: delayedSessionSaver.restart()
-    }
-    Timer {
-        id: exitFullscreenOnLostFocus
-        interval: 500
-        onTriggered: {
-            if (browser.currentWebview) browser.currentWebview.fullscreen = false
-        }
-    }
-    Connections {
-        target: Qt.application
-        onStateChanged: {
-            if (Qt.application.state != Qt.ApplicationActive) {
-                if (!browser.incognito) {
-                    session.save()
-                }
-                if (browser.currentWebview) {
-                    // Workaround for a desktop bug where changing volume causes
-                    // the app to briefly lose focus to notify-osd, and therefore
-                    // exit fullscreen mode. We prevent this by exiting fullscreen
-                    // only if the focus remains lost for longer than a certain
-                    // threshold. See: https://launchpad.net/bugs/694224.
-                    if (__platformName == "xcb") exitFullscreenOnLostFocus.start()
-                    else browser.currentWebview.fullscreen = false
-                }
-            } else exitFullscreenOnLostFocus.stop()
-        }
-        onAboutToQuit: {
-            if (!browser.incognito) {
-                session.save()
-            }
-        }
-    }
-    Connections {
-        target: browser.incognito ? null : publicTabsModel
-        onCurrentTabChanged: delayedSessionSaver.restart()
-        onCountChanged: delayedSessionSaver.restart()
-    }
-    onIncognitoChanged: {
-        if (incognito) {
-            // When going incognito, save the current session right
-            // away, as periodic session saving is disabled.
-            session.save()
-        }
-    }
-
-    // Schedule various expensive tasks to a point after the initialization and
-    // first rendering of the application have already happened.
-    //
-    // Scheduling a Timer with the shortest non-zero interval possible (1ms) will
-    // effectively queue its onTriggered function to run immediately after anything
-    // that is currently in the event loop queue at the moment the Timer starts.
-    //
-    // The tasks are:
-    // - creating the webviews for all initial tabs. This should ideally be done
-    //   asynchronously via object incubation, but http://pad.lv/1359911 prevents it
-    // - loading the HistoryModel and BookmarksModel from the database
-    // - deleting any page screenshots that are no longer needed
-    Timer {
-        running: true
-        interval: 1
-        onTriggered: {
-            if (!browser.newSession && settings.restoreSession) {
-                session.restore()
-            }
-
-            // Sanity check
-            console.assert(tabsModel.count <= browser.maxTabsToRestore,
-                           "WARNING: too many tabs were restored")
-            for (var i in browser.initialUrls) {
-                browser.openUrlInNewTab(browser.initialUrls[i], true, false)
-            }
-            if (tabsModel.count == 0) {
-                browser.openUrlInNewTab(settings.homepage, true, false)
-            }
-            if (!delayedTabSwitcher.running) {
-                tabsModel.currentTab.load()
-            }
-            if (!tabsModel.currentTab.url.toString() && !tabsModel.currentTab.restoreState) {
-                internal.maybeFocusAddressBar()
-            }
-
-            BookmarksModel.databasePath = dataLocation + "/bookmarks.sqlite"
-            HistoryModel.databasePath = dataLocation + "/history.sqlite"
-            DownloadsModel.databasePath = dataLocation + "/downloads.sqlite"
-
-            // Note that the property setter for databasePath won't return until
-            // the entire model has been loaded, so it is safe to call this here
-            PreviewManager.cleanUnusedPreviews(internal.getOpenPages())
-        }
-    }
-
-    Connections {
-        target: MemInfo
-        onFreeChanged: {
-            var freeMemRatio = (MemInfo.total > 0) ? (MemInfo.free / MemInfo.total) : 1.0
-            // Under that threshold, available memory is considered "low", and the
-            // browser is going to try and free up memory from unused tabs. This
-            // value was chosen empirically, it is subject to change to better
-            // reflect what a system under memory pressure might look like.
-            var lowOnMemory = (freeMemRatio < 0.2)
-            if (lowOnMemory) {
-                // Unload an inactive tab to (hopefully) free up some memory
-                function getCandidate(model) {
-                    // Naive implementation that only takes into account the
-                    // last time a tab was current. In the future we might
-                    // want to take into account other parameters such as
-                    // whether the tab is currently playing audio/video.
-                    var candidate = null
-                    for (var i = 0; i < model.count; ++i) {
-                        var tab = model.get(i)
-                        if (tab.current || !tab.webview) {
-                            continue
-                        }
-                        if (!candidate || (candidate.lastCurrent > tab.lastCurrent)) {
-                            candidate = tab
-                        }
-                    }
-                    return candidate
-                }
-                var candidate = getCandidate(publicTabsModel)
-                if (candidate) {
-                    console.warn("Unloading background tab (%1) to free up some memory".arg(candidate.url))
-                    candidate.unload()
-                    return
-                } else if (browser.incognito) {
-                    candidate = getCandidate(privateTabsModelLoader.item)
-                    if (candidate) {
-                        console.warn("Unloading a background incognito tab to free up some memory")
-                        candidate.unload()
-                        return
-                    }
-                }
-                console.warn("System low on memory, but unable to pick a tab to unload")
-            }
-        }
-    }
-
-    Connections {
-        target: session.restoring ? null : tabsModel
-        onCurrentIndexChanged: {
-            // In narrow mode, the tabslist is a stack:
-            // the current tab is always at the top.
-            if (!browser.wide) {
-                tabsModel.move(tabsModel.currentIndex, 0)
-            }
-        }
+    Connections {
+        target: tabsModel
         onCurrentTabChanged: {
             chrome.findInPageMode = false
-            var tab = tabsModel.currentTab
-            if (tab) {
-                tab.load()
-            }
             internal.resetFocus()
         }
-        onCountChanged: {
-            if (tabsModel.count == 0) {
-                if (browser.incognito) {
-                    browser.incognito = false
-                    internal.resetFocus()
-                } else if (browser.wide) {
-                    Qt.quit()
-                }
-            }
-        }
-    }
-
-    Component {
-        id: leavePrivateModeDialog
-
-        LeavePrivateModeDialog {
-            id: dialogue
-            objectName: "leavePrivateModeDialog"
-
-            // This dialog inherits from PopupBase, which has a restoreActiveFocus
-            // function that is called when the dialog is hidden. That keeps the
-            // focus in the address bar/webview when we leave private mode. So any
-            // change on the active focus should be done after the run of such
-            // function
-            Component.onDestruction: {
-                if (!browser.incognito) {
-                    internal.resetFocus()
-                }
-            }
-
-            onCancelButtonClicked: PopupUtils.close(dialogue)
-            onOkButtonClicked: {
-                PopupUtils.close(dialogue)
-                browser.incognito = false
-            }
-        }
     }
 
     // TODO: internationalize non-standard key sequences?
@@ -2025,7 +1713,7 @@
         enabled: tabContainer.visible || recentView.visible ||
                  bookmarksViewLoader.active || historyViewLoader.active
         onActivated: {
-            openUrlInNewTab("", true)
+            internal.openUrlInNewTab("", true)
             if (recentView.visible) recentView.reset()
             bookmarksViewLoader.active = false
             historyViewLoader.active = false
@@ -2190,4 +1878,45 @@
         source: "ContentPickerDialog.qml"
         asynchronous: true
     }
+    
+    DropArea {
+        anchors {
+            fill: parent
+        }
+        keys: ["webbrowser/tab"]
+
+        onEntered: item.opacity = 0.5
+        onExited: item.opacity = 0
+        onDropped: {
+            if (drag.source.tabWindow === window) {
+                console.debug("Dropped in same window");
+                drop.accept(Qt.CopyAction);
+            } else {
+                console.debug("Dropped in new window, moving tab");
+                
+                window.addTab(drop.getDataAsString("webbrowser/tab"));
+                window.tabsModel.currentIndex = window.tabsModel.count - 1;
+                window.tabsModel.currentTab.loadExisting(drag.source.tab);
+                
+                drop.accept(Qt.MoveAction);
+            }
+            
+            item.opacity = 0;
+        }
+
+        Rectangle {
+            id: item
+            anchors {
+                fill: parent
+            }
+            color: "#0F0"
+            opacity: 0
+            
+            Behavior on opacity {
+                NumberAnimation {
+                
+                }
+            }
+        }
+    }
 }

=== modified file 'src/app/webbrowser/BrowserTab.qml'
--- src/app/webbrowser/BrowserTab.qml	2016-05-09 17:54:20 +0000
+++ src/app/webbrowser/BrowserTab.qml	2016-09-28 15:27:35 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.4
+import QtQuick.Window 2.2
 import Ubuntu.Web 0.2
 import com.canonical.Oxide 1.4 as Oxide
 import webbrowserapp.private 0.1
@@ -96,7 +97,18 @@
             }
         }
     }
-
+    
+    function loadExisting(existingTab) {
+        if (!webview && !internal.incubator) {
+            // Reparent the webview and any other vars
+            existingTab.webview.parent = webviewContainer;
+            existingTab.webview.tab = tab;
+            
+            // Set the webview into this window
+            webviewContainer.webview = existingTab.webview;
+        }
+    }
+    
     function unload() {
         if (webview) {
             initialUrl = webview.url
@@ -159,6 +171,11 @@
                 return
             }
 
+            if (Window.visibility == Window.Hidden) {
+                visible = false
+                return
+            }
+
             internal.hiding = true
             webview.grabToImage(function(result) {
                 if (!internal.hiding) {

=== modified file 'src/app/webbrowser/CMakeLists.txt'
--- src/app/webbrowser/CMakeLists.txt	2015-12-10 09:06:06 +0000
+++ src/app/webbrowser/CMakeLists.txt	2016-09-28 15:27:35 +0000
@@ -33,7 +33,9 @@
 
 set(WEBBROWSER_APP_SRC
     cache-deleter.cpp
+    drag-helper.cpp
     file-operations.cpp
+    reparenter.cpp
     searchengine.cpp
     webbrowser-app.cpp
 )

=== removed file 'src/app/webbrowser/LeavePrivateModeDialog.qml'
--- src/app/webbrowser/LeavePrivateModeDialog.qml	2016-05-23 13:25:46 +0000
+++ src/app/webbrowser/LeavePrivateModeDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright 2015-2016 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3
-
-Dialog {
-    title: i18n.tr("Going to public mode will close all private tabs")
-
-    signal cancelButtonClicked()
-    signal okButtonClicked()
-
-    Button {
-        objectName: "leavePrivateModeDialog.cancelButton"
-        anchors { left: parent.left; right: parent.right }
-        text: i18n.tr("Cancel")
-        onClicked: cancelButtonClicked()
-    }
-
-    Button {
-        objectName: "leavePrivateModeDialog.okButton"
-        anchors { left: parent.left; right: parent.right }
-        text: i18n.tr("OK")
-        color: theme.palette.normal.positive
-        onClicked: okButtonClicked()
-    }
-}

=== modified file 'src/app/webbrowser/TabsBar.qml'
--- src/app/webbrowser/TabsBar.qml	2016-02-05 11:21:32 +0000
+++ src/app/webbrowser/TabsBar.qml	2016-09-28 15:27:35 +0000
@@ -19,6 +19,10 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
+
+import webbrowserapp.private 0.1
+
+import "."
 import ".."
 
 Item {
@@ -128,21 +132,28 @@
                 objectName: "tabDelegate"
 
                 readonly property int tabIndex: index
+                readonly property BrowserTab tab: tabsModel.get(index)
+                readonly property BrowserWindow tabWindow: window
 
-                anchors.top: tabsContainer.top
                 property real rightMargin: units.dp(1)
                 width: tabWidth + rightMargin
                 height: tabsContainer.height
+                y: tabsContainer.y  // don't use anchor otherwise drag doesn't work
 
                 acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
                 readonly property bool dragging: drag.active
                 drag {
                     target: (pressedButtons === Qt.LeftButton) ? tabDelegate : null
-                    axis: Drag.XAxis
+                    axis: Drag.XAndYAxis
                     minimumX: 0
                     maximumX: root.width - tabDelegate.width
                     filterChildren: true
                 }
+                
+                DragHelper {
+                    id: dragHelper
+                    source: tabDelegate                
+                }
 
                 TabItem {
                     anchors.fill: parent
@@ -175,7 +186,61 @@
                 }
 
                 Behavior on x { NumberAnimation { duration: 250 } }
-
+                
+                NumberAnimation {
+                    id: resetVerticalAnimation
+                    target: tabDelegate
+                    duration: 250
+                    property: "y"
+                    to: 0
+                }
+                
+                onPositionChanged: {
+                    if (Math.abs(y) > height) {
+                        // Reset visual position of tab delegate
+                        resetVerticalAnimation.start();
+                    
+                        if (mouse.buttons === Qt.LeftButton) {
+                            // Generate tab preview for drag handle
+                            dragHelper.previewUrl = PreviewManager.previewPathFromUrl(tab.url); 
+                        
+                            var dropAction = dragHelper.execDrag(tab.url);
+                            
+                            if (dropAction === Qt.MoveAction) {
+                                // Moved into another window
+                                console.debug("Moved to another window, closing tab");
+                                
+                                // drag.active does not become false when
+                                // closing the tab so set reordering back
+                                repeater.reordering = false;
+
+                                // Just remove from model and do not destory
+                                // as webview is used in other window                                
+                                tabsModel.remove(index);
+                            } else if (dropAction === Qt.CopyAction) {
+                                // Moved into the same window
+                                
+                                // So no action
+                                console.debug("No action, dropped in same window");
+                            } else if (dropAction === Qt.IgnoreAction) {
+                                // Moved outside of any window
+                                console.debug("Moved outside, generating new window");
+                                
+                                // drag.active does not become false when
+                                // closing the tab so set reordering back
+                                repeater.reordering = false;
+
+                                // callback function only removes from model
+                                // and not destroy as webview is in new window
+                                browser.newWindowFromTab(tab, function() { tabsModel.remove(index); })
+                            } else {
+                                // Unknown state
+                                console.debug("Unknown drop action:", dropAction);
+                            }
+                        }
+                    }
+                }
+                onReleased: resetVerticalAnimation.start();
                 onXChanged: {
                     if (!dragging) return
                     if (x < (index * width - width / 2)) {

=== added file 'src/app/webbrowser/drag-helper.cpp'
--- src/app/webbrowser/drag-helper.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/drag-helper.cpp	2016-09-28 15:27:35 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "drag-helper.h"
+
+#include <QDrag>
+#include <QDropEvent>
+#include <QMimeData>
+#include <QPainter>
+#include <QPixmap>
+#include <QSize>
+
+DragHelper::DragHelper()
+{
+    m_active = false;
+    m_mime_type = QStringLiteral("webbrowser/tab");
+    m_preview_url = "";
+    m_source = NULL;
+}
+
+Qt::DropAction DragHelper::execDrag(QString tabId)
+{
+    QDrag *drag = new QDrag(m_source);
+
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData(mimeType(), tabId.toLatin1());
+
+    QSize pixmapSize(200, 150);
+
+    QPixmap pixmap(previewUrl());
+    
+    if (pixmap.isNull()) {
+        // If loading pixmap failed, draw a white rectangle
+        pixmap = QPixmap(pixmapSize);
+        QPainter painter(&pixmap);
+        painter.eraseRect(0, 0, pixmapSize.width(), pixmapSize.height());
+        painter.fillRect(0, 0, pixmapSize.width(), pixmapSize.height(), QColor(255, 255, 255, 255));
+    } else {
+        // Scale image to fit the expected size
+        pixmap = pixmap.scaled(pixmapSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    }
+
+    drag->setHotSpot(QPoint(pixmapSize.width() / 2, pixmapSize.height() / 2));
+    drag->setMimeData(mimeData);
+    drag->setPixmap(pixmap);
+
+    return drag->exec(Qt::CopyAction | Qt::MoveAction | Qt::IgnoreAction);
+}
+
+void DragHelper::setActive(bool active)
+{
+    if (m_active != active) {
+        m_active = active;
+
+        Q_EMIT activeChanged(m_active);
+    }
+}
+
+void DragHelper::setMimeType(QString mimeType)
+{
+    if (m_mime_type != mimeType) {
+        m_mime_type = mimeType;
+
+        Q_EMIT mimeTypeChanged(m_mime_type);
+    }
+}
+
+void DragHelper::setPreviewUrl(QString previewUrl)
+{
+    if (m_preview_url != previewUrl) {
+        m_preview_url = previewUrl;
+
+        Q_EMIT previewUrlChanged(m_preview_url);
+    }
+}
+
+void DragHelper::setSource(QQuickItem *source)
+{
+    if (m_source != source) {
+        m_source = source;
+
+        Q_EMIT sourceChanged(m_source);
+    }
+}
+

=== added file 'src/app/webbrowser/drag-helper.h'
--- src/app/webbrowser/drag-helper.h	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/drag-helper.h	2016-09-28 15:27:35 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DRAGHELPER_H__
+#define __DRAGHELPER_H__
+
+#include <QQuickItem>
+#include <QMouseEvent>
+#include <QRect>
+
+class DragHelper : public QQuickItem
+{
+    Q_OBJECT
+
+    // TODO: add expectedAction
+
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(QString mimeType READ mimeType WRITE setMimeType NOTIFY mimeTypeChanged)
+    Q_PROPERTY(QString previewUrl READ previewUrl WRITE setPreviewUrl NOTIFY previewUrlChanged)
+    Q_PROPERTY(QQuickItem* source READ source WRITE setSource NOTIFY sourceChanged)
+public:
+    DragHelper();
+    bool active() { return m_active; }
+    QString mimeType() { return m_mime_type; }
+    QString previewUrl() { return m_preview_url; }
+    QQuickItem *source() { return m_source; }
+signals:
+    void activeChanged(bool active);
+    void mimeTypeChanged(QString mimeType);
+    void previewUrlChanged(QString previewUrl);
+    void sourceChanged(QQuickItem *source);
+public slots:
+    Q_INVOKABLE Qt::DropAction execDrag(QString tabId);
+    void setActive(bool active);
+    void setMimeType(QString mimeType);
+    void setPreviewUrl(QString previewUrl);
+    void setSource(QQuickItem *source);
+private:
+    bool m_active;
+    QString m_mime_type;
+    QString m_preview_url;
+    QQuickItem *m_source;
+};
+
+#endif // __DRAGHELPER_H__
+

=== added file 'src/app/webbrowser/reparenter.cpp'
--- src/app/webbrowser/reparenter.cpp	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/reparenter.cpp	2016-09-28 15:27:35 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include "reparenter.h"
+
+#include <QDebug>
+
+Reparenter::Reparenter()
+{
+}
+
+void Reparenter::reparent(QQuickItem *obj, QQuickItem *newParent)
+{
+    qDebug() << "Parent:" << obj->parent() << obj->parentItem();
+    
+    obj->setParent(newParent);
+    obj->setParentItem(newParent);
+    
+    qDebug() << "Parent:" << obj->parent() << obj->parentItem();
+}
+

=== added file 'src/app/webbrowser/reparenter.h'
--- src/app/webbrowser/reparenter.h	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/reparenter.h	2016-09-28 15:27:35 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __REPARENTER_H__
+#define __REPARENTER_H__
+
+#include <QObject>
+#include <QQuickItem>
+
+class Reparenter : public QQuickItem
+{
+    Q_OBJECT
+
+public:
+    Reparenter();
+    
+    Q_INVOKABLE void reparent(QQuickItem *obj, QQuickItem *newParent);
+};
+
+#endif // __REPARENTER_H__
+

=== modified file 'src/app/webbrowser/webbrowser-app.cpp'
--- src/app/webbrowser/webbrowser-app.cpp	2016-05-09 22:51:50 +0000
+++ src/app/webbrowser/webbrowser-app.cpp	2016-09-28 15:27:35 +0000
@@ -21,11 +21,13 @@
 #include "cache-deleter.h"
 #include "config.h"
 #include "downloads-model.h"
+#include "drag-helper.h"
 #include "file-operations.h"
 #include "history-domainlist-model.h"
 #include "history-lastvisitdatelist-model.h"
 #include "history-model.h"
 #include "limit-proxy-model.h"
+#include "reparenter.h"
 #include "searchengine.h"
 #include "text-search-filter-model.h"
 #include "tabs-model.h"
@@ -39,6 +41,7 @@
 #include <QtCore/QTextStream>
 #include <QtCore/QtGlobal>
 #include <QtCore/QVariant>
+#include <QtQml/QQmlProperty>
 #include <QtQml/QtQml>
 #include <QtQuick/QQuickWindow>
 
@@ -75,6 +78,8 @@
     qmlRegisterSingletonType<CacheDeleter>(uri, 0, 1, "CacheDeleter", CacheDeleter_singleton_factory);
     qmlRegisterSingletonType<DownloadsModel>(uri, 0, 1, "DownloadsModel", DownloadsModel_singleton_factory);
     qmlRegisterType<TextSearchFilterModel>(uri, 0, 1, "TextSearchFilterModel");
+    qmlRegisterType<DragHelper>(uri, 0, 1, "DragHelper");
+    qmlRegisterType<Reparenter>(uri, 0, 1, "Reparenter");
 
     if (BrowserApplication::initialize("webbrowser/webbrowser-app.qml", QStringLiteral("webbrowser-app"))) {
         QStringList searchEnginesSearchPaths;
@@ -84,15 +89,19 @@
 
         m_engine->rootContext()->setContextProperty("__platformName", platformName());
 
-        m_window->setProperty("newSession", m_arguments.contains("--new-session"));
+        m_component->completeCreate();
 
         QVariantList urls;
         Q_FOREACH(const QUrl& url, this->urls()) {
             urls.append(url);
         }
-        m_window->setProperty("urls", urls);
+        bool newSession = m_arguments.contains(QStringLiteral("--new-session"));
+        bool incognito = m_arguments.contains(QStringLiteral("--incognito"));
+        QMetaObject::invokeMethod(m_object, "init",
+                                  Q_ARG(QVariant, QVariant(urls)),
+                                  Q_ARG(QVariant, newSession),
+                                  Q_ARG(QVariant, incognito));
 
-        m_component->completeCreate();
         return true;
     } else {
         return false;
@@ -103,15 +112,38 @@
 {
     QTextStream out(stdout);
     QString command = QFileInfo(QCoreApplication::applicationFilePath()).fileName();
-    out << "Usage: " << command << " [-h|--help] [--fullscreen] [--maximized] [--inspector]"
+    out << "Usage: " << command << " [-h|--help] [--inspector]"
                                 << " [--app-id=APP_ID] [--new-session] [URL]" << endl;
     out << "Options:" << endl;
     out << "  -h, --help         display this help message and exit" << endl;
-    out << "  --fullscreen       display full screen" << endl;
-    out << "  --maximized        opens the application maximized" << endl;
     out << "  --inspector[=PORT] run a remote inspector on a specified port or " << REMOTE_INSPECTOR_PORT << " as the default port" << endl;
     out << "  --app-id=APP_ID    run the application with a specific APP_ID" << endl;
     out << "  --new-session      do not restore open tabs from the last session" << endl;
+    out << "  --new-window       open (the passed URLs in) a new browser window" << endl;
+    out << "  --incognito        open (the passed URLs in) an incognito window" << endl;
+}
+
+void WebbrowserApp::onNewInstanceLaunched(const QStringList& arguments) const
+{
+    bool newWindow = false;
+    bool incognito = false;
+    QVariantList urls;
+    Q_FOREACH(const QString& argument, arguments) {
+        if (argument == QStringLiteral("--new-window")) {
+            newWindow = true;
+        } else if (argument == QStringLiteral("--incognito")) {
+            incognito = true;
+        } else if (!argument.startsWith(QStringLiteral("-"))) {
+            QUrl url = QUrl::fromUserInput(argument);
+            if (url.isValid()) {
+                urls.append(url);
+            }
+        }
+    }
+    QMetaObject::invokeMethod(m_object, "openUrls",
+                              Q_ARG(QVariant, QVariant(urls)),
+                              Q_ARG(QVariant, newWindow),
+                              Q_ARG(QVariant, incognito));
 }
 
 int main(int argc, char** argv)

=== modified file 'src/app/webbrowser/webbrowser-app.desktop.in.in'
--- src/app/webbrowser/webbrowser-app.desktop.in.in	2015-01-28 17:06:59 +0000
+++ src/app/webbrowser/webbrowser-app.desktop.in.in	2016-09-28 15:27:35 +0000
@@ -16,3 +16,12 @@
 X-Ubuntu-Default-Department-ID=web-browsers
 X-Screenshot=@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app/screenshot.png
 X-Ubuntu-Splash-Color=#FFFFFF
+Actions=NewWindow;Incognito;
+
+[Desktop Action NewWindow]
+_Name=Open a New Window
+Exec=webbrowser-app --new-window
+
+[Desktop Action Incognito]
+_Name=Open a New Private Window
+Exec=webbrowser-app --incognito

=== modified file 'src/app/webbrowser/webbrowser-app.h'
--- src/app/webbrowser/webbrowser-app.h	2016-01-15 09:29:22 +0000
+++ src/app/webbrowser/webbrowser-app.h	2016-09-28 15:27:35 +0000
@@ -31,7 +31,10 @@
     bool initialize();
 
 private:
-    virtual void printUsage() const;
+    void printUsage() const final;
+
+private Q_SLOTS:
+    void onNewInstanceLaunched(const QStringList& arguments) const final;
 };
 
 #endif // __WEBBROWSER_APP_H__

=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2016-01-15 09:29:22 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2016-09-28 15:27:35 +0000
@@ -18,57 +18,463 @@
 
 import QtQuick 2.4
 import QtQuick.Window 2.2
+import Qt.labs.settings 1.0
 import Ubuntu.Components 1.3
+import "."
 import ".."
-
-BrowserWindow {
-    id: window
-
-    property alias urls: browser.initialUrls
-    property alias newSession: browser.newSession
-
-    currentWebview: browser.currentWebview
-
-    title: {
-        if (browser.title) {
-            // TRANSLATORS: %1 refers to the current page’s title
-            return i18n.tr("%1 - Ubuntu Web Browser").arg(browser.title)
-        } else {
-            return i18n.tr("Ubuntu Web Browser")
-        }
-    }
-
-    Browser {
-        id: browser
-        anchors.fill: parent
-        webbrowserWindow: webbrowserWindowProxy
-        developerExtrasEnabled: window.developerExtrasEnabled
-
-        fullscreen: window.visibility === Window.FullScreen
-
-        Component.onCompleted: i18n.domain = "webbrowser-app"
-
-        Keys.onPressed: {
-            if ((event.key === Qt.Key_F11) && (event.modifiers === Qt.NoModifier)) {
-                // F11 to toggle application-level fullscreen
-                window.setFullscreen(window.visibility !== Window.FullScreen)
-                if (currentWebview.fullscreen) {
-                    currentWebview.fullscreen = false
-                }
-            }
-        }
-        Keys.onEscapePressed: {
-            // ESC to exit fullscreen, regardless of whether it was requested
-            // by the page or toggled on by the user.
-            window.setFullscreen(false)
-            currentWebview.fullscreen = false
-        }
-    }
-
-    onOpenUrls: {
-        for (var i = 0; i < urls.length; ++i) {
-            var setCurrent = (i == urls.length - 1)
-            browser.openUrlInNewTab(urls[i], setCurrent, setCurrent)
+import webbrowsercommon.private 0.1
+import webbrowserapp.private 0.1
+
+QtObject {
+    id: webbrowserapp
+
+    function init(urls, newSession, incognito) {
+        i18n.domain = "webbrowser-app"
+        if (!newSession && settings.restoreSession && !incognito) {
+            session.restore()
+        }
+        if (allWindows.length == 0) {
+            windowFactory.createObject(null, {"incognito": incognito}).show()
+        }
+        var window = allWindows[allWindows.length - 1]
+        for (var i in urls) {
+            window.addTab(urls[i]).load()
+            window.tabsModel.currentIndex = window.tabsModel.count - 1
+        }
+        if (window.tabsModel.count == 0) {
+            window.addTab(incognito ? "" : settings.homepage).load()
+            window.tabsModel.currentIndex = 0
+        }
+        for (var w in allWindows) {
+            allWindows[w].tabsModel.currentTab.load()
+        }
+
+        // FIXME: do this asynchronously
+        BookmarksModel.databasePath = dataLocation + "/bookmarks.sqlite"
+        HistoryModel.databasePath = dataLocation + "/history.sqlite"
+        DownloadsModel.databasePath = dataLocation + "/downloads.sqlite"
+
+        var doNotCleanUrls = []
+        for (var x in allWindows) {
+            var tabs = allWindows[x].tabsModel
+            for (var t = 0; t < tabs.count; ++t) {
+                doNotCleanUrls.push(tabs.get(t).url)
+            }
+        }
+        PreviewManager.cleanUnusedPreviews(doNotCleanUrls)
+    }
+
+    // Array of all windows, sorted chronologically (most recently active last)
+    readonly property var allWindows: []
+
+    function getLastActiveWindow(incognito) {
+        for (var i = allWindows.length - 1; i >= 0; --i) {
+            var window = allWindows[i]
+            if (window.incognito == incognito) {
+                return window
+            }
+        }
+        return null
+    }
+
+    function openUrls(urls, newWindow, incognito) {
+        var window = getLastActiveWindow(incognito)
+        if (!window || newWindow) {
+            window = windowFactory.createObject(null, {"incognito": incognito})
+        }
+        for (var i in urls) {
+            window.addTab(urls[i]).load()
+        }
+        if (window.tabsModel.count == 0) {
+            window.addTab().load()
+        }
+        window.tabsModel.currentIndex = window.tabsModel.count - 1
+        window.show()
+        window.requestActivate()
+    }
+    
+    property Reparenter reparenter: Reparenter {
+    
+    }
+
+    property var windowFactory: Component {
+        BrowserWindow {
+            id: window
+
+            property alias incognito: browser.incognito
+            readonly property var tabsModel: browser.tabsModel
+
+            currentWebview: browser.currentWebview
+            
+            title: {
+                if (browser.title) {
+                    // TRANSLATORS: %1 refers to the current page’s title
+                    return i18n.tr("%1 - Ubuntu Web Browser").arg(browser.title)
+                } else {
+                    return i18n.tr("Ubuntu Web Browser")
+                }
+            }
+
+            onActiveChanged: {
+                if (active) {
+                    var index = allWindows.indexOf(this)
+                    if (index > -1) {
+                        allWindows.push(allWindows.splice(index, 1)[0])
+                    }
+                }
+            }
+
+            onClosing: {
+                if (allWindows.length == 1) {
+                    if (tabsModel.count > 0) {
+                        session.save()
+                    } else {
+                        session.clear()
+                    }
+                }
+                destroy()
+            }
+
+            Shortcut {
+                sequence: StandardKey.Quit
+                onActivated: Qt.quit()
+            }
+
+            function toggleApplicationLevelFullscreen() {
+                setFullscreen(visibility !== Window.FullScreen)
+                if (browser.currentWebview.fullscreen) {
+                    browser.currentWebview.fullscreen = false
+                }
+            }
+
+            Shortcut {
+                sequence: StandardKey.FullScreen
+                onActivated: window.toggleApplicationLevelFullscreen()
+            }
+
+            Shortcut {
+                sequence: "F11"
+                onActivated: window.toggleApplicationLevelFullscreen()
+            }
+
+            Shortcut {
+                sequence: "Ctrl+N"
+                onActivated: browser.newWindowRequested(false)
+            }
+
+            Shortcut {
+                sequence: "Ctrl+Shift+N"
+                onActivated: browser.newWindowRequested(true)
+            }
+
+            Component.onCompleted: allWindows.push(this)
+            Component.onDestruction: {
+                for (var w in allWindows) {
+                    if (this === allWindows[w]) {
+                        allWindows.splice(w, 1)
+                        return
+                    }
+                }
+            }
+
+            Browser {
+                id: browser
+                anchors.fill: parent
+                settings: webbrowserapp.settings
+                onNewWindowFromTab: {
+                    var window = windowFactory.createObject(
+                        null,
+                        {
+                            "incognito": tab.incognito,
+                            "height": parent.height,
+                            "width": parent.width,
+                        }
+                    );
+                    
+                    window.addExistingTab(tab);
+                    window.tabsModel.currentIndex = window.tabsModel.count - 1;
+                    window.show();
+                    window.requestActivate();
+                    
+                    window.tabsModel.currentTab.load();
+                    
+                    closeMethod();
+                }
+                onNewWindowRequested: {
+                    var window = windowFactory.createObject(
+                        null,
+                        {
+                            "incognito": incognito,
+                            "height": parent.height,
+                            "width": parent.width,
+                        }
+                    )
+                    window.addTab()
+                    window.tabsModel.currentIndex = 0
+                    window.tabsModel.currentTab.load()
+                    window.show()
+                }
+                onOpenLinkInWindowRequested: {
+                    var window = null
+                    if (incognito) {
+                        window = getLastActiveWindow(true)
+                    }
+                    if (!window) {
+                        window = windowFactory.createObject(
+                            null,
+                            {
+                                "incognito": incognito,
+                                "height": parent.height,
+                                "width": parent.width,
+                            }
+                        )
+                    }
+                    window.addTab(url)
+                    window.tabsModel.currentIndex = window.tabsModel.count - 1
+                    window.tabsModel.currentTab.load()
+                    window.show()
+                    window.requestActivate()
+                }
+
+                // Not handled as a window-level shortcut as it would take
+                // precedence over key events in web content.
+                Keys.onEscapePressed: {
+                    // ESC to exit fullscreen, regardless of whether it was
+                    // requested by the page or toggled on by the user.
+                    window.setFullscreen(false)
+                    browser.currentWebview.fullscreen = false
+                }
+            }
+
+            Connections {
+                target: window.tabsModel
+                onCountChanged: {
+                    if ((window.tabsModel.count === 0) && browser.wide) {
+                        window.close()
+                    }
+                }
+            }
+
+            Connections {
+                target: window.incognito ? null : window.tabsModel
+                onCurrentIndexChanged: delayedSessionSaver.restart()
+                onCountChanged: delayedSessionSaver.restart()
+            }
+
+            Connections {
+                target: (session.restoring || !window.visible || browser.wide) ? null : window.tabsModel
+                onCurrentIndexChanged: {
+                    // In narrow mode, the tabslist is a stack:
+                    // the current tab is always at the top.
+                    window.tabsModel.move(window.tabsModel.currentIndex, 0)
+                }
+            }
+
+            function serializeTabState(tab) {
+                return browser.serializeTabState(tab)
+            }
+
+            function restoreTabState(state) {
+                return browser.restoreTabState(state)
+            }
+
+            function addTab(url) {
+                var tab = browser.createTab({"initialUrl": url})
+                tabsModel.add(tab)
+                return tab
+            }
+            
+            function addExistingTab(tab) {
+                tabsModel.add(tab);
+                
+                browser.bindExistingTab(tab);
+                
+                return tab;
+            }
+        }
+    }
+
+    property var settings: Settings {
+        property url homepage: "http://start.ubuntu.com"
+        property string searchEngine: "google"
+        property bool restoreSession: true
+        property int newTabDefaultSection: 0
+        property string defaultAudioDevice: ""
+        property string defaultVideoDevice: ""
+
+        function restoreDefaults() {
+            homepage  = "http://start.ubuntu.com"
+            searchEngine = "google"
+            restoreSession = true
+            newTabDefaultSection = 0
+            defaultAudioDevice = ""
+            defaultVideoDevice = ""
+        }
+    }
+
+    // Handle runtime requests to open urls as defined
+    // by the freedesktop application dbus interface's open
+    // method for DBUS application activation:
+    // http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
+    // The dispatch on the org.freedesktop.Application if is done per appId at the
+    // url-dispatcher/upstart level.
+    property var openUrlsHandler: Connections {
+        target: UriHandler
+        onOpened: webbrowserapp.openUrls(uris, false, false)
+    }
+
+    property var session: SessionStorage {
+        dataFile: dataLocation + "/session.json"
+
+        // TODO: do we want to save/restore window positions too (https://launchpad.net/bugs/1312892)?
+
+        function save() {
+            if (!locked || restoring) {
+                return
+            }
+            var windows = []
+            for (var w in allWindows) {
+                var window = allWindows[w]
+                if (window.incognito) {
+                    continue
+                }
+                windows.push(serializeWindowState(window))
+            }
+            if (windows.length > 0) {
+                store(JSON.stringify({windows: windows}))
+            }
+        }
+
+        property bool restoring: false
+        function restore() {
+            restoring = true
+            _doRestore()
+            restoring = false
+        }
+        function _doRestore() {
+            if (!locked) {
+                return
+            }
+            var state = null
+            try {
+                state = JSON.parse(retrieve())
+            } catch (e) {
+                return
+            }
+            if (state) {
+                var windows = state.windows
+                if (windows) {
+                    for (var w in windows) {
+                        restoreWindowState(windows[w])
+                    }
+                } else if (state.tabs) {
+                    // One-off code path: when launching the app for the first time
+                    // after the upgrade that adds support for multiple windows, the
+                    // saved session contains a list of tabs, not windows.
+                    restoreWindowState(state)
+                }
+                if (allWindows.length > 0) {
+                    var window = allWindows[allWindows.length - 1]
+                    window.requestActivate()
+                    window.raise()
+                }
+            }
+        }
+
+        function serializeWindowState(window) {
+            var tabs = []
+            for (var i = 0; i < window.tabsModel.count; ++i) {
+                tabs.push(window.serializeTabState(window.tabsModel.get(i)))
+            }
+            return {tabs: tabs, currentIndex: window.tabsModel.currentIndex}
+        }
+
+        function restoreWindowState(state) {
+            var window = windowFactory.createObject(null)
+            for (var i in state.tabs) {
+                window.tabsModel.add(window.restoreTabState(state.tabs[i]))
+            }
+            window.tabsModel.currentIndex = state.currentIndex
+            window.show()
+        }
+
+        function clear() {
+            if (!locked) {
+                return
+            }
+            store("")
+        }
+    }
+
+    property var delayedSessionSaver: Timer {
+        interval: 500
+        onTriggered: session.save()
+    }
+
+    property var periodicSessionSaver: Timer {
+        // Save session periodically to mitigate state loss when the application crashes
+        interval: 60000 // every minute
+        repeat: true
+        running: true
+        onTriggered: delayedSessionSaver.restart()
+    }
+
+    property var applicationMonitor: Connections {
+        target: Qt.application
+        onStateChanged: {
+            if (Qt.application.state != Qt.ApplicationActive) {
+                session.save()
+            }
+        }
+        onAboutToQuit: {
+            if (allWindows.length > 0) {
+                session.save()
+            }
+        }
+    }
+
+    property var memoryPressureMonitor: Connections {
+        target: MemInfo
+        onFreeChanged: {
+            var freeMemRatio = (MemInfo.total > 0) ? (MemInfo.free / MemInfo.total) : 1.0
+            // Under that threshold, available memory is considered "low", and the
+            // browser is going to try and free up memory from unused tabs. This
+            // value was chosen empirically, it is subject to change to better
+            // reflect what a system under memory pressure might look like.
+            var lowOnMemory = (freeMemRatio < 0.2)
+            if (lowOnMemory) {
+                // Unload an inactive tab to (hopefully) free up some memory
+                function getCandidate(model) {
+                    // Naive implementation that only takes into account the
+                    // last time a tab was current. In the future we might
+                    // want to take into account other parameters such as
+                    // whether the tab is currently playing audio/video.
+                    var candidate = null
+                    for (var i = 0; i < model.count; ++i) {
+                        var tab = model.get(i)
+                        if (tab.current || !tab.webview) {
+                            continue
+                        }
+                        if (!candidate || (candidate.lastCurrent > tab.lastCurrent)) {
+                            candidate = tab
+                        }
+                    }
+                    return candidate
+                }
+                for (var w in allWindows) {
+                    var candidate = getCandidate(allWindows[w].tabsModel)
+                    if (candidate) {
+                        if (browser.incognito) {
+                            console.warn("Unloading a background incognito tab to free up some memory")
+                        } else {
+                            console.warn("Unloading background tab (%1) to free up some memory".arg(candidate.url))
+                        }
+                        candidate.unload()
+                        return
+                    }
+                }
+                console.warn("System low on memory, but unable to pick a tab to unload")
+            }
         }
     }
 }

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2016-08-03 09:28:48 +0000
+++ src/app/webcontainer/WebApp.qml	2016-09-28 15:27:35 +0000
@@ -33,6 +33,8 @@
 
     currentWebview: containerWebView.currentWebview
 
+    property alias window: containerWebView.window
+
     property alias url: containerWebView.url
 
     property bool accountSwitcher

=== modified file 'src/app/webcontainer/WebViewImplOxide.qml'
--- src/app/webcontainer/WebViewImplOxide.qml	2016-07-13 16:23:18 +0000
+++ src/app/webcontainer/WebViewImplOxide.qml	2016-09-28 15:27:35 +0000
@@ -28,6 +28,10 @@
 WebappWebview {
     id: webview
 
+    // XXX: Ideally, we would use the Window.window
+    // attached property, but it is new in Qt 5.7.
+    property Window window
+
     property bool developerExtrasEnabled: false
     property string webappName: ""
     property string localUserAgentOverride: ""
@@ -261,13 +265,7 @@
     function getUnityWebappsProxies() {
         var eventHandlers = {
             onAppRaised: function () {
-                if (webbrowserWindow) {
-                    try {
-                        webbrowserWindow.raise();
-                    } catch (e) {
-                        console.debug('Error while raising: ' + e);
-                    }
-                }
+                window.raise();
             }
         };
         return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)

=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	2016-07-13 16:23:18 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2016-09-28 15:27:35 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.4
+import QtQuick.Window 2.2
 import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 import Ubuntu.UnityWebApps 0.1 as UnityWebApps
@@ -26,6 +27,8 @@
 FocusScope {
     id: containerWebview
 
+    property Window window
+
     property string url: ""
     property bool developerExtrasEnabled: false
     property string webappName: ""
@@ -115,7 +118,8 @@
 
         webappContainerWebViewLoader.setSource(
                     webappEngineSource,
-                    { localUserAgentOverride: containerWebview.localUserAgentOverride
+                    { window: containerWebView.window
+                    , localUserAgentOverride: containerWebview.localUserAgentOverride
                     , url: containerWebview.url
                     , webappName: containerWebview.webappName
                     , dataPath: dataPath

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2016-06-20 15:07:52 +0000
+++ src/app/webcontainer/webapp-container.cpp	2016-09-28 15:27:35 +0000
@@ -41,6 +41,7 @@
 #include <QtQml/QQmlComponent>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
+#include <QtQml/QQmlProperty>
 #include <QtQml>
 #include <QtQuick/QQuickWindow>
 
@@ -88,7 +89,9 @@
     m_addressBarVisible(false),
     m_localWebappManifest(false),
     m_openExternalUrlInOverlay(false),
-    m_webappContainerHelper(new WebappContainerHelper())
+    m_webappContainerHelper(new WebappContainerHelper()),
+    m_fullscreen(false),
+    m_maximized(false)
 {
 }
 
@@ -135,34 +138,33 @@
             QDir searchDir(m_webappModelSearchPath);
             searchDir.makeAbsolute();
             if (searchDir.exists()) {
-                m_window->setProperty("webappModelSearchPath", searchDir.path());
+                QQmlProperty::write(m_object, QStringLiteral("webappModelSearchPath"), searchDir.path());
             }
         }
         if ( ! m_localCookieStoreDbPath.isEmpty()) {
-            m_window->setProperty("localCookieStoreDbPath", m_localCookieStoreDbPath);
+            QQmlProperty::write(m_object, QStringLiteral("localCookieStoreDbPath"), m_localCookieStoreDbPath);
         }
 
-        m_window->setProperty("webappName", m_webappName);
+        QQmlProperty::write(m_object, QStringLiteral("webappName"), m_webappName);
         QFileInfo iconInfo(m_webappIcon);
         QUrl iconUrl;
         if (iconInfo.isReadable()) {
             iconUrl = QUrl::fromLocalFile(iconInfo.absoluteFilePath());
         }
-        m_window->setProperty("webappIcon", iconUrl);
-        m_window->setProperty("backForwardButtonsVisible", m_backForwardButtonsVisible);
-        m_window->setProperty("chromeVisible", m_addressBarVisible);
-        m_window->setProperty("accountProvider", m_accountProvider);
-        m_window->setProperty("accountSwitcher", m_accountSwitcher);
-        m_window->setProperty("openExternalUrlInOverlay", m_openExternalUrlInOverlay);
-        m_window->setProperty("defaultVideoCaptureCameraPosition", m_defaultVideoCaptureCameraPosition);
-
-        m_window->setProperty("webappUrlPatterns", m_webappUrlPatterns);
+        QQmlProperty::write(m_object, QStringLiteral("webappIcon"), iconUrl);
+        QQmlProperty::write(m_object, QStringLiteral("backForwardButtonsVisible"), m_backForwardButtonsVisible);
+        QQmlProperty::write(m_object, QStringLiteral("chromeVisible"), m_addressBarVisible);
+        QQmlProperty::write(m_object, QStringLiteral("accountProvider"), m_accountProvider);
+        QQmlProperty::write(m_object, QStringLiteral("accountSwitcher"), m_accountSwitcher);
+        QQmlProperty::write(m_object, QStringLiteral("openExternalUrlInOverlay"), m_openExternalUrlInOverlay);
+        QQmlProperty::write(m_object, QStringLiteral("defaultVideoCaptureCameraPosition"), m_defaultVideoCaptureCameraPosition);
+        QQmlProperty::write(m_object, QStringLiteral("webappUrlPatterns"), m_webappUrlPatterns);
         QQmlContext* context = m_engine->rootContext();
         if (m_storeSessionCookies) {
             QString sessionCookieMode = SessionUtils::firstRun(m_webappName) ?
                 QStringLiteral("persistent") : QStringLiteral("restored");
             qDebug() << "Setting session cookie mode to" << sessionCookieMode;
-            m_window->setProperty("webContextSessionCookieMode", sessionCookieMode);
+            QQmlProperty::write(m_object, QStringLiteral("webContextSessionCookieMode"), sessionCookieMode);
         }
 
         context->setContextProperty("webappContainerHelper", m_webappContainerHelper.data());
@@ -170,35 +172,36 @@
         if ( ! m_popupRedirectionUrlPrefixPattern.isEmpty()) {
             const QString WEBAPP_CONTAINER_DO_NOT_FILTER_PATTERN_URL_ENV_VAR =
                 qgetenv("WEBAPP_CONTAINER_DO_NOT_FILTER_PATTERN_URL");
-            m_window->setProperty(
-                        "popupRedirectionUrlPrefixPattern",
-                        WEBAPP_CONTAINER_DO_NOT_FILTER_PATTERN_URL_ENV_VAR == "1"
-                        ? m_popupRedirectionUrlPrefixPattern
-                        : UrlPatternUtils::transformWebappSearchPatternToSafePattern(
-                              m_popupRedirectionUrlPrefixPattern, false));
+            QQmlProperty::write(
+                m_object, QStringLiteral("popupRedirectionUrlPrefixPattern"),
+                WEBAPP_CONTAINER_DO_NOT_FILTER_PATTERN_URL_ENV_VAR == "1"
+                    ? m_popupRedirectionUrlPrefixPattern
+                    : UrlPatternUtils::transformWebappSearchPatternToSafePattern(
+                        m_popupRedirectionUrlPrefixPattern, false));
         }
 
         if (!m_userAgentOverride.isEmpty()) {
-            m_window->setProperty("localUserAgentOverride", m_userAgentOverride);
+            QQmlProperty::write(m_object, QStringLiteral("localUserAgentOverride"), m_userAgentOverride);
         }
 
         // Experimental, unsupported API, to override the webview
         QFileInfo overrideFile("webview-override.qml");
         if (overrideFile.exists()) {
-            m_window->setProperty("webviewOverrideFile", QUrl::fromLocalFile(overrideFile.absoluteFilePath()));
+            QQmlProperty::write(m_object, QStringLiteral("webviewOverrideFile"),
+                                QUrl::fromLocalFile(overrideFile.absoluteFilePath()));
         }
 
         const QString WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY_ENV_VAR =
             qgetenv("WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY");
         if (WEBAPP_CONTAINER_BLOCK_OPEN_URL_EXTERNALLY_ENV_VAR == "1") {
-            m_window->setProperty("blockOpenExternalUrls", true);
+            QQmlProperty::write(m_object, QStringLiteral("blockOpenExternalUrls"), true);
         }
 
         bool runningLocalApp = false;
         QList<QUrl> urls = this->urls();
         if (!urls.isEmpty()) {
             QUrl homeUrl = urls.last();
-            m_window->setProperty("url", homeUrl);
+            QQmlProperty::write(m_object, QStringLiteral("url"), homeUrl);
             if (UrlPatternUtils::isLocalHtml5ApplicationHomeUrl(homeUrl)) {
                 qDebug() << "Started as a local application container.";
                 runningLocalApp = true;
@@ -213,7 +216,7 @@
         // webapp-properties.json file pulled from the webapp model element
         // or from a default local system install (if any).
 
-        m_window->setProperty("runningLocalApplication", runningLocalApp);
+        QQmlProperty::write(m_object, QStringLiteral("runningLocalApplication"), runningLocalApp);
 
         // Handle the invalid runtime conditions for the local apps
         if (runningLocalApp && !isValidLocalApplicationRunningContext()) {
@@ -226,9 +229,12 @@
 
         if (qEnvironmentVariableIsSet("WEBAPP_CONTAINER_BLOCKER_DISABLED")
                 && QString(qgetenv("WEBAPP_CONTAINER_BLOCKER_DISABLED")) == "1") {
-            m_window->setProperty("popupBlockerEnabled", false);
+            QQmlProperty::write(m_object, QStringLiteral("popupBlockerEnabled"), false);
         }
 
+        QQmlProperty::write(m_object, QStringLiteral("forceFullscreen"), m_fullscreen);
+        QQmlProperty::write(m_object, QStringLiteral("startMaximized"), m_maximized);
+
         m_component->completeCreate();
 
         return true;
@@ -393,6 +399,10 @@
             m_openExternalUrlInOverlay = true;
         } else if (argument.startsWith("--camera-capture-default=")) {
             m_defaultVideoCaptureCameraPosition = argument.split("--camera-capture-default=")[1];
+        } else if (argument == QStringLiteral("--fullscreen")) {
+            m_fullscreen = true;
+        } else if (argument == QStringLiteral("--maximized")) {
+            m_maximized = true;
         }
     }
 }
@@ -482,6 +492,21 @@
     return urls;
 }
 
+void WebappContainer::onNewInstanceLaunched(const QStringList& arguments) const
+{
+    QVariantList urls;
+    Q_FOREACH(const QString& argument, arguments) {
+        if (!argument.startsWith(QStringLiteral("-"))) {
+            QUrl url = QUrl::fromUserInput(argument);
+            if (url.isValid()) {
+                urls.append(url);
+            }
+        }
+    }
+    QMetaObject::invokeMethod(m_object, "openUrls", Q_ARG(QVariant, QVariant(urls)));
+    QMetaObject::invokeMethod(m_object, "requestActivate");
+}
+
 int main(int argc, char** argv)
 {
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);

=== modified file 'src/app/webcontainer/webapp-container.h'
--- src/app/webcontainer/webapp-container.h	2016-06-06 18:46:49 +0000
+++ src/app/webcontainer/webapp-container.h	2016-09-28 15:27:35 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -44,7 +44,7 @@
     virtual QList<QUrl> urls() const;
 
 private:
-    virtual void printUsage() const;
+    void printUsage() const final;
     void earlyEnvironment();
     void parseCommandLine();
     void parseExtraConfiguration();
@@ -56,6 +56,9 @@
     void setupLocalSchemeFilterIfAny(QQmlContext* context, const QString& webappSearchPath);
     QString appId() const;
 
+private Q_SLOTS:
+    void onNewInstanceLaunched(const QStringList& arguments) const final;
+
 private:
     QString m_webappName;
     QString m_webappIcon;
@@ -74,6 +77,8 @@
     QScopedPointer<WebappContainerHelper> m_webappContainerHelper;
     QScopedPointer<SchemeFilter> m_schemeFilter;
     QString m_defaultVideoCaptureCameraPosition;
+    bool m_fullscreen;
+    bool m_maximized;
 
     static const QString URL_PATTERN_SEPARATOR;
     static const QString LOCAL_SCHEME_FILTER_FILENAME;

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2016-07-13 16:23:18 +0000
+++ src/app/webcontainer/webapp-container.qml	2016-09-28 15:27:35 +0000
@@ -53,6 +53,8 @@
 
     property bool runningLocalApplication: false
 
+    property bool startMaximized: false
+
     title: getWindowTitle()
 
     // Used for testing
@@ -79,6 +81,8 @@
         WebApp {
             id: browser
 
+            window: root
+
             url: accountProvider.length !== 0 ? "" : root.url
 
             accountSwitcher: root.accountSwitcher
@@ -108,8 +112,6 @@
 
             anchors.fill: parent
 
-            webbrowserWindow: webbrowserWindowProxy
-
             onWebappNameChanged: {
                 if (root.webappName !== browser.webappName) {
                     root.webappName = browser.webappName;
@@ -215,6 +217,13 @@
 
     Component.onCompleted: {
         i18n.domain = "webbrowser-app"
+        if (forceFullscreen) {
+            showFullScreen()
+        } else if (startMaximized) {
+            showMaximized()
+        } else {
+            show()
+        }
     }
 
     function showWebView() {
@@ -300,7 +309,7 @@
         return uri
     }
 
-    onOpenUrls: {
+    function openUrls(urls) {
         // only consider the first one (if multiple)
         if (urls.length === 0 || !root.currentWebview) {
             return;

=== modified file 'tests/autopilot/webbrowser_app/__init__.py'
--- tests/autopilot/webbrowser_app/__init__.py	2015-05-06 22:33:59 +0000
+++ tests/autopilot/webbrowser_app/__init__.py	2016-09-28 15:27:35 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright 2013-2015 Canonical
+# Copyright 2013-2016 Canonical
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -39,3 +39,6 @@
     @property
     def main_window(self):
         return self.select_single(browser.Browser)
+
+    def get_windows(self, **kwargs):
+        return self.select_many(browser.Browser, **kwargs)

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2016-05-03 11:28:56 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2016-09-28 15:27:35 +0000
@@ -52,39 +52,6 @@
     def go_forward(self):
         self.chrome.go_forward()
 
-    @autopilot.logging.log_action(logger.info)
-    def enter_private_mode(self):
-        if not self.is_in_private_mode():
-            self.chrome.toggle_private_mode()
-        else:
-            logger.warning('The browser is already in private mode.')
-
-    def is_in_private_mode(self):
-        return self.get_current_webview().incognito
-
-    @autopilot.logging.log_action(logger.info)
-    def leave_private_mode(self):
-        if self.is_in_private_mode():
-            self.chrome.toggle_private_mode()
-        else:
-            logger.warning('The browser is not in private mode.')
-
-    @autopilot.logging.log_action(logger.info)
-    def leave_private_mode_with_confirmation(self, confirm=True):
-        if self.is_in_private_mode():
-            self.chrome.toggle_private_mode()
-            dialog = self._get_leave_private_mode_dialog()
-            if confirm:
-                dialog.confirm()
-            else:
-                dialog.cancel()
-            dialog.wait_until_destroyed()
-        else:
-            logger.warning('The browser is not in private mode.')
-
-    def _get_leave_private_mode_dialog(self):
-        return self.wait_select_single(LeavePrivateModeDialog, visible=True)
-
     # Since the NewPrivateTabView does not define any new QML property in its
     # extended file, it does not report itself to autopilot with the same name
     # as the extended file. (See http://pad.lv/1454394)
@@ -307,13 +274,6 @@
         forward_button = self._get_forward_button()
         return forward_button.enabled
 
-    def toggle_private_mode(self):
-        drawer_button = self.get_drawer_button()
-        self.pointing_device.click_object(drawer_button)
-        self.get_drawer()
-        private_mode_action = self.get_drawer_action("privatemode")
-        self.pointing_device.click_object(private_mode_action)
-
     def get_drawer_button(self):
         return self.select_single("ChromeButton", objectName="drawerButton")
 
@@ -573,21 +533,6 @@
                       key=lambda item: item.globalRect.y)
 
 
-class LeavePrivateModeDialog(uitk.Dialog):
-
-    @autopilot.logging.log_action(logger.info)
-    def confirm(self):
-        confirm_button = self.select_single(
-            "Button", objectName="leavePrivateModeDialog.okButton")
-        self.pointing_device.click_object(confirm_button)
-
-    @autopilot.logging.log_action(logger.info)
-    def cancel(self):
-        cancel_button = self.select_single(
-            "Button", objectName="leavePrivateModeDialog.cancelButton")
-        self.pointing_device.click_object(cancel_button)
-
-
 class NewTabView(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
     def get_bookmarks_more_button(self):

=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2016-03-21 16:13:49 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2016-09-28 15:27:35 +0000
@@ -176,6 +176,28 @@
 
         return new_tab_view
 
+    def open_new_window(self):
+        windows = self.app.get_windows(incognito=False)
+        chrome = self.main_window.chrome
+        drawer_button = chrome.get_drawer_button()
+        self.pointing_device.click_object(drawer_button)
+        chrome.get_drawer()
+        new_window_action = chrome.get_drawer_action("newwindow")
+        self.pointing_device.click_object(new_window_action)
+        self.assertThat(lambda: len(self.app.get_windows(incognito=False)),
+                        Eventually(Equals(len(windows) + 1)))
+
+    def open_new_private_window(self):
+        windows = self.app.get_windows(incognito=True)
+        chrome = self.main_window.chrome
+        drawer_button = chrome.get_drawer_button()
+        self.pointing_device.click_object(drawer_button)
+        chrome.get_drawer()
+        new_window_action = chrome.get_drawer_action("newprivatewindow")
+        self.pointing_device.click_object(new_window_action)
+        self.assertThat(lambda: len(self.app.get_windows(incognito=True)),
+                        Eventually(Equals(len(windows) + 1)))
+
     def open_settings(self):
         chrome = self.main_window.chrome
         drawer_button = chrome.get_drawer_button()

=== modified file 'tests/autopilot/webbrowser_app/tests/test_contextmenu.py'
--- tests/autopilot/webbrowser_app/tests/test_contextmenu.py	2016-03-07 11:35:28 +0000
+++ tests/autopilot/webbrowser_app/tests/test_contextmenu.py	2016-09-28 15:27:35 +0000
@@ -54,6 +54,19 @@
         self.assertThat(webview.url,
                         Eventually(StartsWith(self.data_uri_prefix)))
 
+    def verify_link_opened_in_a_new_window(self, incognito):
+        self.assertThat(lambda: len(self.app.get_windows(incognito=incognito)),
+                        Eventually(Equals(1 if incognito else 2)))
+        windows = self.app.get_windows()
+        urls = [window.get_current_webview().url for window in windows]
+        self.assertThat(sorted(urls),
+                        Equals(sorted([self.base_url + "/test1", self.url])))
+        if incognito:
+            windows = self.app.get_windows(incognito=True)
+            self.assertThat(len(windows), Equals(1))
+            self.assertThat(windows[0].get_current_webview().url,
+                            Equals(self.base_url + "/test1"))
+
 
 class TestContextMenuLink(TestContextMenuBase):
 
@@ -66,6 +79,14 @@
         self.menu.click_action("OpenLinkInNewTabContextualAction")
         self.verify_link_opened_in_a_new_tab()
 
+    def test_open_link_in_new_window(self):
+        self.menu.click_action("OpenLinkInNewWindowContextualAction")
+        self.verify_link_opened_in_a_new_window(False)
+
+    def test_open_link_in_private_window(self):
+        self.menu.click_action("OpenLinkInPrivateWindowContextualAction")
+        self.verify_link_opened_in_a_new_window(True)
+
     def test_bookmark_link(self):
         self.menu.click_action("BookmarkLinkContextualAction")
         bookmark_options = self.main_window.get_bookmark_options()
@@ -111,6 +132,14 @@
         self.menu.click_action("OpenLinkInNewTabContextualAction")
         self.verify_link_opened_in_a_new_tab()
 
+    def test_open_link_in_new_window(self):
+        self.menu.click_action("OpenLinkInNewWindowContextualAction")
+        self.verify_link_opened_in_a_new_window(False)
+
+    def test_open_link_in_private_window(self):
+        self.menu.click_action("OpenLinkInPrivateWindowContextualAction")
+        self.verify_link_opened_in_a_new_window(True)
+
     def test_bookmark_link(self):
         self.menu.click_action("BookmarkLinkContextualAction")
         bookmark_options = self.main_window.get_bookmark_options()

=== modified file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2015-07-03 16:04:21 +0000
+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2016-09-28 15:27:35 +0000
@@ -98,57 +98,3 @@
         self.main_window.press_key('F11')
         self.assert_window_fullscreen(False)
         self.assert_webview_fullscreen(False)
-
-
-class TestForcedFullscreen(TestFullscreenBase):
-
-    def setUp(self):
-        self.ARGS = self.ARGS + ["--fullscreen"]
-        super(TestForcedFullscreen, self).setUp(path="/fullscreen")
-        self.assert_window_fullscreen(True)
-        self.assert_webview_fullscreen(False)
-
-    def tearDown(self):
-        super(TestForcedFullscreen, self).tearDown()
-        self.assert_window_fullscreen(True)
-
-    @testtools.skipIf(model() == "Desktop", "on touch devices only")
-    def test_disabled_user_exit_swipe_up(self):
-        self.open_tabs_view()
-
-    @testtools.skipIf(model() != "Desktop", "on desktop only")
-    def test_disabled_user_exit_ESC(self):
-        self.main_window.press_key('Escape')
-
-    @testtools.skipIf(model() != "Desktop", "on desktop only")
-    def test_disabled_user_exit_F11(self):
-        self.main_window.press_key('F11')
-
-    def trigger_page_fullscreen(self):
-        webview = self.main_window.get_current_webview()
-        self.pointing_device.click_object(webview)
-        self.assert_webview_fullscreen(True)
-
-    def test_page_exit(self):
-        self.trigger_page_fullscreen()
-        webview = self.main_window.get_current_webview()
-        self.pointing_device.click_object(webview)
-        self.assert_webview_fullscreen(False)
-
-    @testtools.skipIf(model() == "Desktop", "on touch devices only")
-    def test_user_exit_swipe_up(self):
-        self.trigger_page_fullscreen()
-        self.open_tabs_view()
-        self.assert_webview_fullscreen(False)
-
-    @testtools.skipIf(model() != "Desktop", "on desktop only")
-    def test_user_exit_ESC(self):
-        self.trigger_page_fullscreen()
-        self.main_window.press_key('Escape')
-        self.assert_webview_fullscreen(False)
-
-    @testtools.skipIf(model() != "Desktop", "on desktop only")
-    def test_user_exit_F11(self):
-        self.trigger_page_fullscreen()
-        self.main_window.press_key('F11')
-        self.assert_webview_fullscreen(False)

=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-05-23 15:49:49 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2016-09-28 15:27:35 +0000
@@ -572,3 +572,25 @@
         self.check_tab_number(0)
         webview = self.main_window.get_current_webview()
         self.assertThat(webview.zoomFactor, Eventually(AlmostEquals(1.1)))
+
+    def test_new_window(self):
+        self.main_window.press_key('Ctrl+n')
+        self.assertThat(lambda: len(self.app.get_windows(incognito=False)),
+                        Eventually(Equals(2)))
+        window = self.app.get_windows(activeFocus=True)[0]
+        if window.wide:
+            window.press_key('Ctrl+w')
+            window.wait_until_destroyed()
+            windows = self.app.get_windows(activeFocus=True, incognito=False)
+            self.assertThat(len(windows), Equals(1))
+
+    def test_new_private_window(self):
+        self.main_window.press_key('Ctrl+Shift+n')
+        self.assertThat(lambda: len(self.app.get_windows(incognito=True)),
+                        Eventually(Equals(1)))
+        window = self.app.get_windows(activeFocus=True, incognito=True)[0]
+        if window.wide:
+            window.press_key('Ctrl+w')
+            window.wait_until_destroyed()
+            windows = self.app.get_windows(activeFocus=True, incognito=False)
+            self.assertThat(len(windows), Equals(1))

=== added file 'tests/autopilot/webbrowser_app/tests/test_multiple_windows.py'
--- tests/autopilot/webbrowser_app/tests/test_multiple_windows.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webbrowser_app/tests/test_multiple_windows.py	2016-09-28 15:27:35 +0000
@@ -0,0 +1,40 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from testtools.matchers import Equals
+
+from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
+
+
+class TestMultipleWindows(StartOpenRemotePageTestCaseBase):
+
+    def test_open_new_window(self):
+        windows = self.app.get_windows()
+        self.assertThat(len(windows), Equals(1))
+        self.open_new_window()
+        windows = self.app.get_windows()
+        self.assertThat(len(windows), Equals(2))
+        for window in windows:
+            self.assertThat(window.incognito, Equals(False))
+
+    def test_open_new_private_window(self):
+        windows = self.app.get_windows()
+        self.assertThat(len(windows), Equals(1))
+        self.open_new_private_window()
+        windows = self.app.get_windows()
+        self.assertThat(len(windows), Equals(2))
+        self.assertThat(len(self.app.get_windows(incognito=False)), Equals(1))
+        self.assertThat(len(self.app.get_windows(incognito=True)), Equals(1))

=== modified file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py'
--- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2016-06-15 16:21:51 +0000
+++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2016-09-28 15:27:35 +0000
@@ -95,55 +95,6 @@
         self.assertThat(new_tab_view.visible, Equals(True))
 
 
-class TestNewPrivateTabViewLifetime(StartOpenRemotePageTestCaseBase):
-
-    def test_new_private_tab_view_destroyed_when_browsing(self):
-        self.main_window.enter_private_mode()
-        new_private_tab_view = self.main_window.get_new_private_tab_view()
-        self.main_window.go_to_url(self.base_url + "/test2")
-        new_private_tab_view.wait_until_destroyed()
-
-    def test_new_private_tab_view_destroyed_when_leaving_private_mode(self):
-        self.main_window.enter_private_mode()
-        new_private_tab_view = self.main_window.get_new_private_tab_view()
-        self.main_window.leave_private_mode()
-        new_private_tab_view.wait_until_destroyed()
-
-    def test_new_private_tab_view_is_shared_between_tabs(self):
-        self.main_window.enter_private_mode()
-        new_private_tab_view = self.main_window.get_new_private_tab_view()
-        self.main_window.go_to_url(self.base_url + "/test2")
-        new_private_tab_view.wait_until_destroyed()
-        # Open one new private tab
-        new_private_tab_view = self.open_new_tab(open_tabs_view=True)
-        # Open a second new private tab
-        new_private_tab_view_2 = self.open_new_tab(open_tabs_view=True)
-        # Verify that they share the same NewPrivateTabView instance
-        self.assertThat(new_private_tab_view_2.id,
-                        Equals(new_private_tab_view.id))
-        # Close the second new private tab, and verify that the
-        # NewPrivateTabView instance is still there
-        if self.main_window.wide:
-            self.main_window.chrome.get_tabs_bar().close_tab(2)
-        else:
-            tabs_view = self.open_tabs_view()
-            tabs_view.get_previews()[0].close()
-            toolbar = self.main_window.get_recent_view_toolbar()
-            toolbar.click_button("doneButton")
-            tabs_view.visible.wait_for(False)
-        self.assertThat(new_private_tab_view.visible, Equals(True))
-        # Close the first new private tab, and verify that the
-        # NewPrivateTabView instance is destroyed
-        if self.main_window.wide:
-            self.main_window.chrome.get_tabs_bar().close_tab(1)
-        else:
-            tabs_view = self.open_tabs_view()
-            tabs_view.get_previews()[0].close()
-            toolbar = self.main_window.get_recent_view_toolbar()
-            toolbar.click_button("doneButton")
-        new_private_tab_view.wait_until_destroyed()
-
-
 class TestNewTabViewContentsBase(StartOpenRemotePageTestCaseBase):
 
     def setUp(self):

=== removed file 'tests/autopilot/webbrowser_app/tests/test_private.py'
--- tests/autopilot/webbrowser_app/tests/test_private.py	2016-03-29 20:08:14 +0000
+++ tests/autopilot/webbrowser_app/tests/test_private.py	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright 2015-2016 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-from testtools.matchers import Equals, NotEquals
-from autopilot.matchers import Eventually
-from autopilot.platform import model
-
-from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
-
-
-class TestPrivateView(StartOpenRemotePageTestCaseBase):
-
-    def test_going_in_and_out_private_mode(self):
-        address_bar = self.main_window.address_bar
-        self.main_window.enter_private_mode()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(True)))
-        self.assert_number_incognito_webviews_eventually(1)
-        self.assertTrue(self.main_window.is_new_private_tab_view_visible())
-        self.assertThat(address_bar.activeFocus,
-                        Eventually(Equals(model() == 'Desktop')))
-        self.assertThat(address_bar.text, Eventually(Equals("")))
-
-        self.main_window.leave_private_mode()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(False)))
-        self.assert_number_incognito_webviews_eventually(0)
-        self.assertThat(address_bar.text, Eventually(NotEquals("")))
-        self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
-
-    def test_leaving_private_mode_with_multiples_tabs_ask_confirmation(self):
-        self.main_window.enter_private_mode()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(True)))
-        self.assertTrue(self.main_window.is_new_private_tab_view_visible())
-        if not self.main_window.wide:
-            self.open_tabs_view()
-        self.open_new_tab()
-        self.main_window.leave_private_mode_with_confirmation()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(False)))
-
-    def test_cancel_leaving_private_mode(self):
-        self.main_window.enter_private_mode()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(True)))
-        self.assertTrue(self.main_window.is_new_private_tab_view_visible())
-        if not self.main_window.wide:
-            self.open_tabs_view()
-        self.open_new_tab()
-        self.main_window.leave_private_mode_with_confirmation(confirm=False)
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(True)))
-        self.assertTrue(self.main_window.is_new_private_tab_view_visible())
-
-    def test_url_showing_in_top_sites_in_and_out_private_mode(self):
-        new_tab = self.open_new_tab(open_tabs_view=True)
-        urls = [site.url for site in new_tab.get_top_site_items()]
-        self.assertIn(self.url, urls)
-
-        self.main_window.enter_private_mode()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(True)))
-        url = self.base_url + "/test2"
-        self.main_window.go_to_url(url)
-        self.main_window.wait_until_page_loaded(url)
-        self.main_window.leave_private_mode()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(False)))
-
-        new_tab = self.open_new_tab(open_tabs_view=True)
-        urls = [site.url for site in new_tab.get_top_site_items()]
-        self.assertNotIn(url, urls)
-
-    def test_public_tabs_should_not_be_visible_in_private_mode(self):
-        self.open_new_tab(open_tabs_view=True)
-        new_tab_view = self.main_window.get_new_tab_view()
-        url = self.base_url + "/test2"
-        self.main_window.go_to_url(url)
-        new_tab_view.wait_until_destroyed()
-        if self.main_window.wide:
-            tabs = self.main_window.chrome.get_tabs_bar().get_tabs()
-            self.assertThat(len(tabs), Equals(2))
-        else:
-            tabs_view = self.open_tabs_view()
-            previews = tabs_view.get_previews()
-            self.assertThat(len(previews), Equals(2))
-            toolbar = self.main_window.get_recent_view_toolbar()
-            toolbar.click_button("doneButton")
-            tabs_view.visible.wait_for(False)
-
-        self.main_window.enter_private_mode()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(True)))
-        self.assertTrue(self.main_window.is_new_private_tab_view_visible())
-        if self.main_window.wide:
-            tabs = self.main_window.chrome.get_tabs_bar().get_tabs()
-            self.assertThat(len(tabs), Equals(1))
-        else:
-            tabs_view = self.open_tabs_view()
-            previews = tabs_view.get_previews()
-            self.assertThat(len(previews), Equals(1))

=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2016-01-21 10:29:17 +0000
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2016-09-28 15:27:35 +0000
@@ -319,48 +319,3 @@
         self.main_window.press_key('Ctrl+Shift+t')
         self.assert_number_webviews_eventually(3)
         self.check_current_tab(url2)
-
-    @testtools.skipIf(model() != "Desktop", "on desktop only")
-    def test_undo_close_tab_incognito(self):
-        start_url = self.main_window.get_current_webview().url
-        self.open_new_tab(open_tabs_view=not self.main_window.wide)
-        url = self.base_url + "/tab/1"
-        self.main_window.go_to_url(url)
-        self.main_window.wait_until_page_loaded(url)
-
-        self.main_window.press_key('Ctrl+w')
-        self.assert_number_webviews_eventually(1)
-        self.check_current_tab(start_url)
-
-        incognito_url = self.base_url + "/tab/2"
-        self.main_window.enter_private_mode()
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(True)))
-        self.main_window.go_to_url(incognito_url)
-        self.main_window.wait_until_page_loaded(incognito_url)
-
-        self.open_new_tab(open_tabs_view=not self.main_window.wide)
-        self.main_window.go_to_url(incognito_url)
-        self.main_window.wait_until_page_loaded(incognito_url)
-        self.main_window.press_key('Ctrl+w')
-        self.assert_number_incognito_webviews_eventually(1)
-
-        # Test that no tabs will be restored in incognito mode.
-        # We sleep for a bit after the keypress to give more confidence that
-        # the tab still hasn't appeared within a reasonable amount of time.
-        self.main_window.press_key('Ctrl+Shift+w')
-        time.sleep(1)
-        self.assert_number_incognito_webviews_eventually(1)
-
-        # Close the last incognito tab to exit the mode. This is done on
-        # purpose instead of using leave_private_mode since we want to
-        # make sure the last tab is also not saved, as it is a corner case
-        self.main_window.press_key('Ctrl+w')
-        self.assertThat(self.main_window.is_in_private_mode,
-                        Eventually(Equals(False)))
-
-        # Tabs that we closed before going incognito will be restored
-        # when going back to default mode
-        self.main_window.press_key('Ctrl+Shift+w')
-        self.assert_number_webviews_eventually(2)
-        self.check_current_tab(url)

=== added file 'tests/unittests/qml/tst_BrowserWindow.qml'
--- tests/unittests/qml/tst_BrowserWindow.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/qml/tst_BrowserWindow.qml	2016-09-28 15:27:35 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Window 2.2
+import QtTest 1.0
+import "../../../src/app"
+
+Item {
+    width: 200
+    height: 200
+
+    QtObject {
+        id: webviewMock
+        property bool fullscreen: false
+    }
+
+    Component {
+        id: windowFactory
+        BrowserWindow {
+            currentWebview: webviewMock
+        }
+    }
+
+    SignalSpy {
+        id: visibilitySpy
+        target: testcase.currentWindow
+        signalName: "visibilityChanged"
+    }
+
+    TestCase {
+        id: testcase
+        name: "BrowserWindow"
+        when: windowShown
+
+        property var currentWindow
+
+        function init() {
+            currentWindow = windowFactory.createObject(null)
+            currentWindow.show()
+            compare(currentWindow.visibility, Window.Windowed)
+            visibilitySpy.clear()
+        }
+
+        function cleanup() {
+            currentWindow.destroy()
+        }
+
+        function test_fullscreen_data() {
+            return [
+                {forceFullscreen: false, state: Window.Windowed},
+                {forceFullscreen: false, state: Window.Minimized},
+                {forceFullscreen: false, state: Window.Maximized},
+                {forceFullscreen: false, state: Window.Hidden},
+                {forceFullscreen: true, state: Window.FullScreen},
+            ]
+        }
+
+        function test_fullscreen_on_webview_fullscreen_data() {
+            return test_fullscreen_data()
+        }
+
+        function test_fullscreen_on_webview_fullscreen(data) {
+            currentWindow.forceFullscreen = data.forceFullscreen
+            currentWindow.visibility = data.state
+            visibilitySpy.clear()
+            webviewMock.fullscreen = true
+            tryCompare(visibilitySpy, "count", data.forceFullscreen ? 0 : 1)
+            compare(currentWindow.visibility, Window.FullScreen)
+            webviewMock.fullscreen = false
+            tryCompare(visibilitySpy, "count", data.forceFullscreen ? 0 : 2)
+            compare(currentWindow.visibility, data.state)
+        }
+
+        function test_setfullscreen_data() {
+            return test_fullscreen_data()
+        }
+
+        function test_setfullscreen(data) {
+            currentWindow.forceFullscreen = data.forceFullscreen
+            currentWindow.visibility = data.state
+            visibilitySpy.clear()
+            currentWindow.setFullscreen(true)
+            tryCompare(visibilitySpy, "count", data.forceFullscreen ? 0 : 1)
+            compare(currentWindow.visibility, Window.FullScreen)
+            currentWindow.setFullscreen(false)
+            tryCompare(visibilitySpy, "count", data.forceFullscreen ? 0 : 2)
+            compare(currentWindow.visibility, data.state)
+        }
+    }
+}