Merge lp:~ahayzen/webbrowser-app/fix-1633040-add-js-dialog-ap-tests into lp:webbrowser-app

[Andrew Hayzen]

* Add autopilot tests javascript dialogs to webbrowser and webapp-container - alertDialog, beforeUnloadDialog, confirmDialog and promptDialog

* Add autopilot tests javascript dialogs to webbrowser and webapp-container - alertDialog, beforeUnloadDialog, confirmDialog and promptDialog

TESTING:
Run the following test suites:
webapp_container.tests.test_js_dialogs.TestJSDialogs
webbrowser_app.tests.test_js_dialogs.TestJSDialogs

[lp:~ahayzen/webbrowser-app/fix-1633040-add-js-dialog-ap-tests]

1561. By Andrew Hayzen on 2016-10-13

* Revert .pot changes

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

FAILED: Continuous integration, rev:1560
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/705/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1837/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1838
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1678
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1678/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1678
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1678/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1678
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1678/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1678
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1678/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1678
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1678/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1678
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1678/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1678/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1678/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1678
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1678/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/webbrowser-app/fix-1633040-add-js-dialog-ap-tests]

1562. By Andrew Hayzen on 2016-10-13

* Ensure dialog closes on before unload tests

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2016-06-13 13:41:48 +0000
+++ .bzrignore	2016-10-13 14:41:36 +0000
@@ -31,6 +31,7 @@
 doc/html
 click-hooks/webapp-container-hook
 click-hooks/webapp-container.hook
+setup/gui/webbrowser-app.desktop
 
 obj-*
 debian/usr.bin.webbrowser-app
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-01 13:09:27 +0000
+++ CMakeLists.txt	2016-10-13 14:41:36 +0000
@@ -11,11 +11,6 @@
 if(NOT INTLTOOL_EXTRACT)
     message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
 endif()
-find_program(XVFBRUN xvfb-run)
-if(NOT XVFBRUN)
-  message(FATAL_ERROR "Could not find xvfb-run, please install the xvfb package")
-endif()
-set(XVFB_COMMAND ${XVFBRUN} -s "-screen 0 640x480x24" -a)
 
 # Standard install paths
 include(GNUInstallDirs)
@@ -67,13 +62,15 @@
 add_subdirectory(tests)
 
 # make non compiled files (QML, JS, images, etc.) visible in QtCreator
-file(GLOB NON_COMPILED_ROOT *.png .bzrignore COPYING README)
+file(GLOB NON_COMPILED_ROOT *.png .bzrignore COPYING make-snap.sh README snapcraft.yaml)
 file(GLOB_RECURSE NON_COMPILED_SUBDIRS
      debian/*.dirs debian/*.install debian/*.lintian-overrides debian/*.manifest
      debian/compat debian/control debian/copyright debian/rules debian/source/format
      debian/tests/*
      doc/*.css doc/*.qdoc doc/*.qdocconf
      po/*.po po/*.pot
+     setup/gui/*.png setup/gui/webbrowser-app.desktop.in
+     snap/webbrowser-app.launcher
      src/*.js src/*.qml src/*.sci src/README
      tests/*.py tests/*.qml)
 add_custom_target(NON_COMPILED_TARGET ALL SOURCES ${NON_COMPILED_ROOT} ${NON_COMPILED_SUBDIRS})
 
=== modified file 'debian/control'
--- debian/control	2016-08-25 09:52:00 +0000
+++ debian/control	2016-10-13 14:41:36 +0000
@@ -11,7 +11,7 @@
                dh-translations,
                libapparmor-dev,
                libevdev-dev,
-               liboxideqt-qmlplugin (>= 1.15),
+               liboxideqt-qmlplugin (>= 1.12),
                libqt5sql5-sqlite,
                libudev-dev,
                lsb-release,
@@ -23,7 +23,6 @@
                qml-module-qtquick2 (>= 5.4),
                qml-module-qtquick-layouts,
                qml-module-qttest,
-               qmlscene,
                qt5-default,
                qt5-qmake,
                qtbase5-dev (>= 5.4),
 
=== added file 'make-snap.sh'
--- make-snap.sh	1970-01-01 00:00:00 +0000
+++ make-snap.sh	2016-10-13 14:41:36 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+SNAP_DESKTOP_FILE=setup/gui/webbrowser-app.desktop
+intltool-merge -d -u po $SNAP_DESKTOP_FILE.in $SNAP_DESKTOP_FILE
+snapcraft
 
=== modified file 'po/webbrowser-app.pot'
--- po/webbrowser-app.pot	2016-10-04 14:07:17 +0000
+++ po/webbrowser-app.pot	2016-10-13 14:41:36 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: webbrowser-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-04 16:02+0200\n"
+"POT-Creation-Date: 2016-10-13 12:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -24,7 +24,7 @@
 
 #: src/app/AlertDialog.qml:26 src/app/AuthenticationDialog.qml:47
 #: src/app/ConfirmDialog.qml:26 src/app/HttpAuthenticationDialog.qml:59
-#: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:101
+#: src/app/PromptDialog.qml:32 src/app/webbrowser/BookmarkOptions.qml:122
 msgid "OK"
 msgstr ""
 
@@ -48,10 +48,10 @@
 
 #: src/app/AuthenticationDialog.qml:53 src/app/ConfirmDialog.qml:32
 #: src/app/HttpAuthenticationDialog.qml:69 src/app/PromptDialog.qml:38
-#: src/app/webbrowser/BookmarkOptions.qml:143
+#: src/app/webbrowser/BookmarkOptions.qml:164
 #: src/app/webbrowser/ContentDownloadDialog.qml:114
 #: src/app/webbrowser/ContextMenuMobile.qml:139
-#: src/app/webbrowser/DownloadDelegate.qml:187
+#: src/app/webbrowser/DownloadDelegate.qml:178
 #: src/app/webbrowser/SettingsPage.qml:258
 #: src/app/webbrowser/SettingsPage.qml:312
 #: src/app/webcontainer/AccountChooserDialog.qml:96
@@ -378,7 +378,7 @@
 msgid "Erase"
 msgstr ""
 
-#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:569
+#: src/app/actions/FindInPage.qml:23 src/app/webbrowser/Browser.qml:548
 msgid "Find in page"
 msgstr ""
 
@@ -408,8 +408,8 @@
 msgid "Address;URL;www"
 msgstr ""
 
-#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:440
-#: src/app/webbrowser/TabsBar.qml:91
+#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:420
+#: src/app/webbrowser/TabsBar.qml:103
 msgid "New Tab"
 msgstr ""
 
@@ -456,7 +456,7 @@
 msgstr ""
 
 #: src/app/actions/Reload.qml:23 src/app/webbrowser/SadTab.qml:86
-#: src/app/webbrowser/TabsBar.qml:96 src/app/webcontainer/SadPage.qml:51
+#: src/app/webbrowser/TabsBar.qml:108 src/app/webcontainer/SadPage.qml:51
 msgid "Reload"
 msgstr ""
 
@@ -478,11 +478,11 @@
 msgid "Save video"
 msgstr ""
 
-#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:83
+#: src/app/actions/SelectAll.qml:22 src/app/webbrowser/DownloadsPage.qml:84
 msgid "Select all"
 msgstr ""
 
-#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:549
+#: src/app/actions/Share.qml:22 src/app/webbrowser/Browser.qml:528
 msgid "Share"
 msgstr ""
 
@@ -504,36 +504,36 @@
 msgid "search or enter an address"
 msgstr ""
 
-#: src/app/webbrowser/BookmarkOptions.qml:48
+#: src/app/webbrowser/BookmarkOptions.qml:66
 msgid "Bookmark Added"
 msgstr ""
 
 #. TRANSLATORS: Field where the title of bookmarked URL can be changed
-#: src/app/webbrowser/BookmarkOptions.qml:53
+#: src/app/webbrowser/BookmarkOptions.qml:71
 msgid "Name"
 msgstr ""
 
 #. TRANSLATORS: Field to choose the folder where bookmarked URL will be saved in
-#: src/app/webbrowser/BookmarkOptions.qml:71
+#: src/app/webbrowser/BookmarkOptions.qml:89
 msgid "Save in"
 msgstr ""
 
-#: src/app/webbrowser/BookmarkOptions.qml:78
+#: src/app/webbrowser/BookmarkOptions.qml:96
 #: src/app/webbrowser/BookmarksFoldersView.qml:133
 #: src/app/webbrowser/BookmarksFoldersViewWide.qml:105
 msgid "All Bookmarks"
 msgstr ""
 
-#: src/app/webbrowser/BookmarkOptions.qml:93
-#: src/app/webbrowser/BookmarkOptions.qml:133
+#: src/app/webbrowser/BookmarkOptions.qml:114
+#: src/app/webbrowser/BookmarkOptions.qml:154
 msgid "New Folder"
 msgstr ""
 
-#: src/app/webbrowser/BookmarkOptions.qml:115
+#: src/app/webbrowser/BookmarkOptions.qml:136
 msgid "Create new folder"
 msgstr ""
 
-#: src/app/webbrowser/BookmarkOptions.qml:153
+#: src/app/webbrowser/BookmarkOptions.qml:174
 #: src/app/webbrowser/SettingsPage.qml:322
 msgid "Save"
 msgstr ""
@@ -547,14 +547,14 @@
 
 #: src/app/webbrowser/BookmarksView.qml:32
 #: src/app/webbrowser/BookmarksViewWide.qml:32
-#: src/app/webbrowser/Browser.qml:557 src/app/webbrowser/NewTabView.qml:130
+#: src/app/webbrowser/Browser.qml:536 src/app/webbrowser/NewTabView.qml:130
 #: src/app/webbrowser/NewTabViewWide.qml:139
 msgid "Bookmarks"
 msgstr ""
 
 #: src/app/webbrowser/BookmarksView.qml:76
 #: src/app/webbrowser/BookmarksViewWide.qml:75
-#: src/app/webbrowser/Browser.qml:426 src/app/webbrowser/HistoryView.qml:126
+#: src/app/webbrowser/Browser.qml:406 src/app/webbrowser/HistoryView.qml:126
 #: src/app/webbrowser/HistoryViewWide.qml:407
 msgid "Done"
 msgstr ""
@@ -563,45 +563,37 @@
 #: src/app/webbrowser/BookmarksViewWide.qml:89
 #: src/app/webbrowser/HistoryView.qml:140
 #: src/app/webbrowser/HistoryViewWide.qml:421
-#: src/app/webbrowser/TabsBar.qml:153 src/app/webbrowser/TabsList.qml:99
+#: src/app/webbrowser/TabsBar.qml:165 src/app/webbrowser/TabsList.qml:99
 msgid "New tab"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:537
+#: src/app/webbrowser/Browser.qml:516
 msgid "New window"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:543
+#: src/app/webbrowser/Browser.qml:522
 msgid "New private window"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:563 src/app/webbrowser/HistoryView.qml:30
+#: src/app/webbrowser/Browser.qml:542 src/app/webbrowser/HistoryView.qml:30
 #: src/app/webbrowser/HistoryViewWide.qml:35
 msgid "History"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:576 src/app/webbrowser/DownloadsPage.qml:45
+#: src/app/webbrowser/Browser.qml:555 src/app/webbrowser/DownloadsPage.qml:46
 msgid "Downloads"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:583 src/app/webbrowser/SettingsPage.qml:41
+#: src/app/webbrowser/Browser.qml:562 src/app/webbrowser/SettingsPage.qml:41
 msgid "Settings"
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the current number of tabs opened
-#: src/app/webbrowser/Browser.qml:756 src/app/webbrowser/Browser.qml:794
+#: src/app/webbrowser/Browser.qml:735 src/app/webbrowser/Browser.qml:773
 #, qt-format
 msgid "(%1)"
 msgstr ""
 
-#: src/app/webbrowser/Browser.qml:1337
-msgid "Swipe Up To Exit Full Screen"
-msgstr ""
-
-#: src/app/webbrowser/Browser.qml:1338
-msgid "Press ESC To Exit Full Screen"
-msgstr ""
-
 #: src/app/webbrowser/ContentDownloadDialog.qml:83
 msgid ""
 "Choose an application to open this file or add it to the downloads folder."
@@ -615,23 +607,29 @@
 msgid "Download"
 msgstr ""
 
-#: src/app/webbrowser/DownloadDelegate.qml:159
+#: src/app/webbrowser/DownloadDelegate.qml:151
 msgid "Download failed"
 msgstr ""
 
-#: src/app/webbrowser/DownloadDelegate.qml:208
+#. TRANSLATORS: %1 is the percentage of the download completed so far
+#: src/app/webbrowser/DownloadDelegate.qml:194
+#, qt-format
+msgid "%1%"
+msgstr ""
+
+#: src/app/webbrowser/DownloadDelegate.qml:199
 msgid "Resume"
 msgstr ""
 
-#: src/app/webbrowser/DownloadsPage.qml:59
+#: src/app/webbrowser/DownloadsPage.qml:60
 msgid "Confirm selection"
 msgstr ""
 
-#: src/app/webbrowser/DownloadsPage.qml:99
+#: src/app/webbrowser/DownloadsPage.qml:100
 msgid "Delete"
 msgstr ""
 
-#: src/app/webbrowser/DownloadsPage.qml:252
+#: src/app/webbrowser/DownloadsPage.qml:260
 msgid "No downloads available"
 msgstr ""
 
@@ -819,11 +817,19 @@
 msgid "Camera"
 msgstr ""
 
+#: src/app/webbrowser/TabComponent.qml:388
+msgid "Swipe Up To Exit Full Screen"
+msgstr ""
+
+#: src/app/webbrowser/TabComponent.qml:389
+msgid "Press ESC To Exit Full Screen"
+msgstr ""
+
 #: src/app/webbrowser/TabPreview.qml:86
 msgid "Tap to view"
 msgstr ""
 
-#: src/app/webbrowser/TabsBar.qml:102
+#: src/app/webbrowser/TabsBar.qml:114
 msgid "Close Tab"
 msgstr ""
 
@@ -832,13 +838,13 @@
 msgstr ""
 
 #. TRANSLATORS: %1 refers to the current page’s title
-#: src/app/webbrowser/webbrowser-app.qml:108
+#: src/app/webbrowser/webbrowser-app.qml:99
 #: src/app/webcontainer/webapp-container.qml:72
 #, qt-format
 msgid "%1 - Ubuntu Web Browser"
 msgstr ""
 
-#: src/app/webbrowser/webbrowser-app.qml:110
+#: src/app/webbrowser/webbrowser-app.qml:101
 #: src/app/webcontainer/webapp-container.qml:74
 msgid "Ubuntu Web Browser"
 msgstr ""
 
=== added directory 'setup'
=== added directory 'setup/gui'
=== added symlink 'setup/gui/icon.png'
=== target is u'../../webbrowser-app.png'
=== added symlink 'setup/gui/screenshot.png'
=== target is u'../../screenshot.png'
=== added file 'setup/gui/webbrowser-app.desktop.in'
--- setup/gui/webbrowser-app.desktop.in	1970-01-01 00:00:00 +0000
+++ setup/gui/webbrowser-app.desktop.in	2016-10-13 14:41:36 +0000
@@ -0,0 +1,27 @@
+[Desktop Entry]
+Version=1.0
+_Name=Browser
+_GenericName=Web Browser
+_Comment=Browse the World Wide Web
+_Keywords=Internet;WWW;Browser;Web;Explorer
+Type=Application
+Icon=${SNAP}/meta/gui/icon.png
+Exec=webbrowser-app %u
+Terminal=false
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
+X-Ubuntu-Touch=true
+X-Ubuntu-Gettext-Domain=webbrowser-app
+X-Ubuntu-Single-Instance=true
+X-Ubuntu-Default-Department-ID=web-browsers
+X-Screenshot=${SNAP}/meta/gui/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
 
=== added directory 'snap'
=== added file 'snap/webbrowser-app.launcher'
--- snap/webbrowser-app.launcher	1970-01-01 00:00:00 +0000
+++ snap/webbrowser-app.launcher	2016-10-13 14:41:36 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Disable the chromium sandbox to work around https://launchpad.net/bugs/1599234.
+# Rely on snapd’s security policy instead.
+export OXIDE_NO_SANDBOX=1
+
+# Explicitly set APP_ID.
+export APP_ID=webbrowser-app
+
+exec "$SNAP/bin/desktop-launch" "webbrowser-app" --desktop_file_hint=unity8 "$@"
 
=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2016-10-13 14:41:36 +0000
@@ -0,0 +1,66 @@
+name: webbrowser-app
+version: 0.23+16.10.20160928-0ubuntu1
+summary: Ubuntu web browser
+description: A lightweight web browser tailored for Ubuntu, based on the Oxide browser engine and using the Ubuntu UI components.
+confinement: strict
+
+apps:
+  webbrowser-app:
+    command: webbrowser-app.launcher
+    plugs:
+      - browser-sandbox
+      - camera
+      - network
+      - network-bind
+      - opengl
+      - pulseaudio
+      - screen-inhibit-control
+      - unity7
+
+plugs:
+  browser-sandbox:
+    interface: browser-support
+    allow-sandbox: true
+
+parts:
+  webbrowser-app:
+    plugin: cmake
+    source: .
+    build-packages:
+      - intltool
+      - libapparmor-dev
+      - libevdev-dev
+      - libudev-dev
+      - lsb-release
+      - pkg-config
+      - qt5-default
+      - qt5-qmake
+      - qtbase5-dev
+      - qtbase5-dev-tools
+      - qtbase5-private-dev
+      - qtdeclarative5-dev
+      - qttools5-dev-tools
+      - xvfb
+    stage-packages:
+      - fonts-liberation
+      - liboxideqt-qmlplugin
+      - libqt5sql5-sqlite
+      - mir-graphics-drivers-desktop
+      - qml-module-qt-labs-folderlistmodel
+      - qml-module-qt-labs-settings
+      - qml-module-qtquick2
+      - qml-module-qtquick-layouts
+      - qml-module-qtquick-window2
+      - qml-module-ubuntu-components
+      - qml-module-ubuntu-thumbnailer0.1
+      - qtdeclarative5-ubuntu-content1
+      - qtdeclarative5-ubuntu-download-manager0.1
+      - qtdeclarative5-unity-action-plugin
+      - qtubuntu-desktop
+    after: [desktop-qt5]
+
+  launcher:
+    plugin: dump
+    source: snap
+    organize:
+      webbrowser-app.launcher: bin/webbrowser-app.launcher
 
=== modified file 'src/Ubuntu/CMakeLists.txt'
--- src/Ubuntu/CMakeLists.txt	2016-07-01 13:06:40 +0000
+++ src/Ubuntu/CMakeLists.txt	2016-10-13 14:41:36 +0000
@@ -23,13 +23,5 @@
     OUTPUT_VARIABLE UBUNTU_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
 add_definitions(-DUBUNTU_VERSION="${UBUNTU_VERSION}")
 
-execute_process(COMMAND ${XVFB_COMMAND} qmlscene --quit ${CMAKE_CURRENT_SOURCE_DIR}/chromium-version.qml
-    OUTPUT_VARIABLE CHROMIUM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REGEX MATCH "\\[(.*)\\]" _ ${CHROMIUM_VERSION})
-set(CHROMIUM_VERSION ${CMAKE_MATCH_1})
-if(NOT CHROMIUM_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
-    message(FATAL_ERROR "Invalid chromium version: '${CHROMIUM_VERSION}'")
-endif()
-
 add_subdirectory(Components)
 add_subdirectory(Web)
 
=== modified file 'src/Ubuntu/Web/UbuntuWebContext.qml'
--- src/Ubuntu/Web/UbuntuWebContext.qml	2016-09-13 16:07:06 +0000
+++ src/Ubuntu/Web/UbuntuWebContext.qml	2016-10-13 14:41:36 +0000
@@ -91,7 +91,13 @@
             }
             if (temp !== null) {
                 console.log("Loaded %1 UA override(s) from %2".arg(temp.overrides.length).arg(Qt.resolvedUrl(script)))
-                userAgentOverrides = temp.overrides
+                var chromiumVersion = Oxide.Oxide.chromiumVersion
+                var overrides = []
+                for (var o in temp.overrides) {
+                    var override = temp.overrides[o]
+                    overrides.push([override[0], override[1].replace(/\$\{CHROMIUM_VERSION\}/g, chromiumVersion)])
+                }
+                userAgentOverrides = overrides
                 temp.destroy()
             }
         }
 
=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js.in'
--- src/Ubuntu/Web/ua-overrides-desktop.js.in	2016-09-21 16:15:10 +0000
+++ src/Ubuntu/Web/ua-overrides-desktop.js.in	2016-10-13 14:41:36 +0000
@@ -19,17 +19,17 @@
 .pragma library
 
 var overrides = [
-      ["^https?:\/\/.+\.google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/@CHROMIUM_VERSION@ Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
-      ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1284158
-      ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1412880
-      ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649
-      ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1452616
+      ["^https?:\/\/.+\.google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/${CHROMIUM_VERSION} Chrome/${CHROMIUM_VERSION} Safari/537.36"],
+      ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1284158
+      ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1412880
+      ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649
+      ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1452616
 
       // Google hangouts (https://launchpad.net/bugs/1565055)
-      ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
-      ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
-      ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
+      ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
+      ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
+      ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
 
       // Google recaptcha (https://launchpad.net/bugs/1599146)
-      ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
+      ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
 ];
 
=== modified file 'src/Ubuntu/Web/ua-overrides-mobile.js.in'
--- src/Ubuntu/Web/ua-overrides-mobile.js.in	2016-08-19 10:10:12 +0000
+++ src/Ubuntu/Web/ua-overrides-mobile.js.in	2016-10-13 14:41:36 +0000
@@ -19,18 +19,18 @@
 .pragma library
 
 var overrides = [
-    ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1375889
-    ["^https?:\/\/(www|m)\.youtube\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1228415, http://pad.lv/1415107, http://pad.lv/1417258, http://pad.lv/1499394, http://pad.lv/1408760, http://pad.lv/1437485
-    ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1284158
-    ["^https?:\/\/(\w+\.)*hsbc\.com\.br\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1380657
-    ["^http:\/\/(\w+\.)*espn\.(go\.)?com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1316259
-    ["^https?:\/\/(www|m)\.facebook\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1538056, http://pad.lv/1457661
-    ["^https?:\/\/(mobile\.)?nytimes\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"], // http://pad.lv/1573620
+    ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1375889
+    ["^https?:\/\/(www|m)\.youtube\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1228415, http://pad.lv/1415107, http://pad.lv/1417258, http://pad.lv/1499394, http://pad.lv/1408760, http://pad.lv/1437485
+    ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1284158
+    ["^https?:\/\/(\w+\.)*hsbc\.com\.br\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1380657
+    ["^http:\/\/(\w+\.)*espn\.(go\.)?com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1316259
+    ["^https?:\/\/(www|m)\.facebook\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1538056, http://pad.lv/1457661
+    ["^https?:\/\/(mobile\.)?nytimes\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1573620
     // Google hangouts (https://launchpad.net/bugs/1565055)
-    ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"],
-    ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"],
-    ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Mobile Safari/537.36"],
+    ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
+    ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
+    ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
 
     // Google recaptcha (https://launchpad.net/bugs/1599146)
-    ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
+    ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
 ];
 
=== modified file 'src/app/AlertDialog.qml'
--- src/app/AlertDialog.qml	2016-05-23 13:25:46 +0000
+++ src/app/AlertDialog.qml	2016-10-13 14:41:36 +0000
@@ -20,11 +20,13 @@
 import Ubuntu.Components 1.3
 
 ModalDialog {
+    objectName: "alertDialog"
     title: i18n.tr("JavaScript Alert")
 
     Button {
         text: i18n.tr("OK")
         color: theme.palette.normal.positive
+        objectName: "okButton"
         onClicked: model.accept()
     }
 }
 
=== modified file 'src/app/BeforeUnloadDialog.qml'
--- src/app/BeforeUnloadDialog.qml	2016-05-23 13:25:46 +0000
+++ src/app/BeforeUnloadDialog.qml	2016-10-13 14:41:36 +0000
@@ -20,15 +20,18 @@
 import Ubuntu.Components 1.3
 
 ModalDialog {
+    objectName: "beforeUnloadDialog"
     title: i18n.tr("Confirm Navigation")
 
     Button {
         text: i18n.tr("Leave")
         color: theme.palette.normal.negative
+        objectName: "leaveButton"
         onClicked: model.accept()
     }
 
     Button {
+        objectName: "stayButton"
         text: i18n.tr("Stay")
         onClicked: model.reject()
     }
 
=== modified file 'src/app/ChromeBase.qml'
--- src/app/ChromeBase.qml	2015-12-02 18:01:18 +0000
+++ src/app/ChromeBase.qml	2016-10-13 14:41:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -25,9 +25,11 @@
 
     objectName: "chromeBase"
 
-    property var webview
     property alias backgroundColor: backgroundRect.color
 
+    property alias loading: progressBar.visible
+    property alias loadProgress: progressBar.value
+
     states: [
         State {
             name: "shown"
@@ -53,7 +55,7 @@
     }
 
     ThinProgressBar {
-        webview: chrome.webview
+        id: progressBar
 
         anchors {
             left: parent.left
 
=== modified file 'src/app/ConfirmDialog.qml'
--- src/app/ConfirmDialog.qml	2016-05-23 13:25:46 +0000
+++ src/app/ConfirmDialog.qml	2016-10-13 14:41:36 +0000
@@ -20,15 +20,18 @@
 import Ubuntu.Components 1.3
 
 ModalDialog {
+    objectName: "confirmDialog"
     title: i18n.tr("JavaScript Confirmation")
 
     Button {
         text: i18n.tr("OK")
         color: theme.palette.normal.positive
+        objectName: "okButton"
         onClicked: model.accept()
     }
 
     Button {
+        objectName: "cancelButton"
         text: i18n.tr("Cancel")
         onClicked: model.reject()
     }
 
=== modified file 'src/app/Downloader.qml'
--- src/app/Downloader.qml	2016-01-12 14:50:27 +0000
+++ src/app/Downloader.qml	2016-10-13 14:41:36 +0000
@@ -34,9 +34,7 @@
 
     Component {
         id: metadataComponent
-        Metadata {
-            showInIndicator: true
-        }
+        Metadata {}
     }
 
     Component {
@@ -62,14 +60,8 @@
         singleDownload.download(url)
     }
 
-    function downloadPicture(url, headers) {
-        var metadata = metadataComponent.createObject(downloadItem)
-        downloadItem.mimeType = "image/*"
-        download(url, ContentType.Pictures, headers, metadata)
-    }
-
-    function downloadMimeType(url, mimeType, headers, filename) {
-        var metadata = metadataComponent.createObject(downloadItem)
+    function downloadMimeType(url, mimeType, headers, filename, incognito) {
+        var metadata = metadataComponent.createObject(downloadItem, {"showInIndicator": !incognito})
         var contentType = MimeTypeMapper.mimeTypeToContentType(mimeType)
         if (contentType == ContentType.Unknown && filename) {
             // If we can't determine the content type from the mime-type
 
=== modified file 'src/app/PromptDialog.qml'
--- src/app/PromptDialog.qml	2016-05-23 13:25:46 +0000
+++ src/app/PromptDialog.qml	2016-10-13 14:41:36 +0000
@@ -20,10 +20,12 @@
 import Ubuntu.Components 1.3
 
 ModalDialog {
+    objectName: "promptDialog"
     title: i18n.tr("JavaScript Prompt")
 
     TextField {
         id: input
+        objectName: "inputTextField"
         text: model.defaultValue
         onAccepted: model.accept(input.text)
     }
@@ -31,10 +33,12 @@
     Button {
         text: i18n.tr("OK")
         color: theme.palette.normal.positive
+        objectName: "okButton"
         onClicked: model.accept(input.text)
     }
 
     Button {
+        objectName: "cancelButton"
         text: i18n.tr("Cancel")
         onClicked: model.reject()
     }
 
=== modified file 'src/app/ThinProgressBar.qml'
--- src/app/ThinProgressBar.qml	2015-08-10 15:22:00 +0000
+++ src/app/ThinProgressBar.qml	2016-10-13 14:41:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -20,11 +20,8 @@
 import Ubuntu.Components 1.3
 
 ProgressBar {
-    property var webview
-
     height: units.dp(3)
-
     showProgressPercentage: false
-    value: webview ? webview.loadProgress / 100 : 0.0
-    visible: webview ? webview.loading : false
+    minimumValue: 0
+    maximumValue: 100
 }
 
=== modified file 'src/app/WebViewImpl.qml'
--- src/app/WebViewImpl.qml	2015-12-15 12:37:34 +0000
+++ src/app/WebViewImpl.qml	2016-10-13 14:41:36 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -76,7 +76,7 @@
                     mimeType = MimeDatabase.filenameToMimeType(filename)
                 }
             }
-            downloadLoader.item.downloadMimeType(request.url, mimeType, headers, request.suggestedFilename)
+            downloadLoader.item.downloadMimeType(request.url, mimeType, headers, request.suggestedFilename, incognito)
         } else {
             // Desktop form factor case
             Qt.openUrlExternally(request.url)
 
=== modified file 'src/app/config.h.in'
--- src/app/config.h.in	2016-05-26 17:00:55 +0000
+++ src/app/config.h.in	2016-10-13 14:41:36 +0000
@@ -22,19 +22,20 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 #include <QtCore/QString>
+#include <QtCore/QtGlobal>
 
 #define REMOTE_INSPECTOR_PORT 9221
 
 inline bool isRunningInstalled()
 {
-    static bool installed = (QCoreApplication::applicationDirPath() == QDir("@CMAKE_INSTALL_FULL_BINDIR@").canonicalPath());
+    static bool installed = (QCoreApplication::applicationDirPath() == QDir(qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_BINDIR@")).canonicalPath());
     return installed;
 }
 
 inline QString UbuntuBrowserDirectory()
 {
     if (isRunningInstalled()) {
-        return QStringLiteral("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app");
+        return qgetenv("SNAP").append("@CMAKE_INSTALL_FULL_DATADIR@/webbrowser-app");
     } else {
         return QStringLiteral("@CMAKE_SOURCE_DIR@/src/app");
     }
 
=== modified file 'src/app/webbrowser/BookmarkOptions.qml'
--- src/app/webbrowser/BookmarkOptions.qml	2016-05-23 02:52:50 +0000
+++ src/app/webbrowser/BookmarkOptions.qml	2016-10-13 14:41:36 +0000
@@ -19,18 +19,36 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
+import webbrowserapp.private 0.1
 
 Popover {
     id: bookmarkOptions
 
     property url bookmarkUrl
     property alias bookmarkTitle: titleTextField.text
-    property alias folderModel: folderOptionSelector.model
 
-    readonly property string bookmarkFolder: folderModel.get(folderOptionSelector.selectedIndex).folder
+    readonly property string bookmarkFolder: folderOptionSelector.model.get(folderOptionSelector.selectedIndex).folder
 
     contentHeight: bookmarkOptionsColumn.childrenRect.height + units.gu(2)
 
+    onVisibleChanged: {
+        if (!visible) {
+            BookmarksModel.remove(bookmarkUrl)
+        }
+    }
+
+    Component.onDestruction: {
+        if (BookmarksModel.contains(bookmarkUrl)) {
+            BookmarksModel.update(bookmarkUrl, bookmarkTitle, bookmarkFolder)
+        }
+    }
+
+    // Fragile workaround for https://launchpad.net/bugs/1546677.
+    // By destroying the popover, its visibility isn’t changed to
+    // false, and thus the bookmark is not removed.
+    Keys.onEnterPressed: bookmarkOptions.destroy()
+    Keys.onReturnPressed: bookmarkOptions.destroy()
+
     Column {
         id: bookmarkOptionsColumn
 
@@ -77,6 +95,9 @@
 
             delegate: OptionSelectorDelegate { text: folder === "" ? i18n.tr("All Bookmarks") : folder }
             containerHeight: itemHeight * 3
+            model: BookmarksFolderListModel {
+                sourceModel: BookmarksModel
+            }
         }
 
         Item {
@@ -120,8 +141,8 @@
 
             function createNewFolder(folder) {
                 Qt.inputMethod.hide()
-                folderModel.createNewFolder(folder)
-                folderOptionSelector.selectedIndex = folderModel.indexOf(folder) 
+                folderOptionSelector.model.createNewFolder(folder)
+                folderOptionSelector.selectedIndex = folderOptionSelector.model.indexOf(folder)
                 folderOptionSelector.currentlyExpanded = false
                 PopupUtils.close(dialogue)
             }
 
=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-09-28 08:24:06 +0000
+++ src/app/webbrowser/Browser.qml	2016-10-13 14:41:36 +0000
@@ -88,7 +88,7 @@
            tabs will have their mediaAccessPermissionRequested signal handled by
            creating one of these new dialogs.
         */
-        onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
+        onMediaAccessPermissionRequested: PopupUtils.open(Qt.resolvedUrl("../MediaAccessDialog.qml"), null, { request: request })
     }
 
     currentWebcontext: SharedWebContext.sharedContext
@@ -119,11 +119,6 @@
         id: keyboardModel
     }
 
-    Component {
-        id: mediaAccessDialogComponent
-        MediaAccessDialog {}
-    }
-
     actions: [
         Actions.GoTo {
             onTriggered: currentWebview.url = value
@@ -200,12 +195,16 @@
                 fill: tabContainer
                 topMargin: (chrome.state == "shown") ? chrome.height : 0
             }
-            sourceComponent: ErrorSheet {
-                visible: currentWebview ? currentWebview.lastLoadFailed : false
-                url: currentWebview ? currentWebview.url : ""
+            Component.onCompleted: setSource("../ErrorSheet.qml", {
+                                                 "visible": Qt.binding(function(){ return currentWebview ? currentWebview.lastLoadFailed : false }),
+                                                 "url": Qt.binding(function(){ return currentWebview ? currentWebview.url : "" })
+                                             })
+            Connections {
+                target: errorSheetLoader.item
                 onRefreshClicked: currentWebview.reload()
             }
-            focus: item.visible
+
+            focus: item && item.visible
             asynchronous: true
         }
 
@@ -215,9 +214,12 @@
                 fill: tabContainer
                 topMargin: (chrome.state == "shown") ? chrome.height : 0
             }
-            sourceComponent: InvalidCertificateErrorSheet {
-                visible: currentWebview && currentWebview.certificateError != null
-                certificateError: currentWebview ? currentWebview.certificateError : null
+            Component.onCompleted: setSource("../InvalidCertificateErrorSheet.qml", {
+                                                 "visible": Qt.binding(function(){ return currentWebview && currentWebview.certificateError != null }),
+                                                 "certificateError": Qt.binding(function(){ return currentWebview ? currentWebview.certificateError : null })
+                                             })
+            Connections {
+                target: invalidCertificateErrorSheetLoader.item
                 onAllowed: {
                     // Automatically allow future requests involving this
                     // certificate for the duration of the session.
@@ -228,7 +230,7 @@
                     currentWebview.resetCertificateError()
                 }
             }
-            focus: item.visible
+            focus: item && item.visible
             asynchronous: true
         }
 
@@ -262,60 +264,35 @@
                         newTabViewLoader.active = !tab.url.toString() && !tab.restoreState
                     }
                 }
-            }
-
-            sourceComponent: browser.incognito ? newPrivateTabView :
-                             (browser.wide ? newTabViewWide : newTabView)
-
-            Component {
-                id: newTabView
-
-                NewTabView {
-                    anchors.fill: parent
-                    settingsObject: settings
-                    focus: true
-                    onBookmarkClicked: {
-                        chrome.requestedUrl = url
-                        currentWebview.url = url
-                        tabContainer.forceActiveFocus()
-                    }
-                    onBookmarkRemoved: BookmarksModel.remove(url)
-                    onHistoryEntryClicked: {
-                        chrome.requestedUrl = url
-                        currentWebview.url = url
-                        tabContainer.forceActiveFocus()
-                    }
-                    Keys.onUpPressed: chrome.focus = true
-                }
-            }
-
-            Component {
-                id: newTabViewWide
-
-                NewTabViewWide {
-                    anchors.fill: parent
-                    settingsObject: settings
-                    focus: true
-                    onBookmarkClicked: {
-                        chrome.requestedUrl = url
-                        currentWebview.url = url
-                        tabContainer.forceActiveFocus()
-                    }
-                    onBookmarkRemoved: BookmarksModel.remove(url)
-                    onHistoryEntryClicked: {
-                        chrome.requestedUrl = url
-                        currentWebview.url = url
-                        tabContainer.forceActiveFocus()
-                    }
-                    Keys.onUpPressed: chrome.focus = true
-                }
-            }
-
-            Component {
-                id: newPrivateTabView
-
-                NewPrivateTabView { anchors.fill: parent }
-            }
+                onWideChanged: newTabViewLoader.selectTabView()
+            }
+            Component.onCompleted: newTabViewLoader.selectTabView()
+
+            function selectTabView() {
+                var source = browser.incognito ? "NewPrivateTabView.qml" :
+                                                 (browser.wide ? "NewTabViewWide.qml" :
+                                                                 "NewTabView.qml");
+                var properties = browser.incognito ? {} : {"settingsObject": settings,
+                                                           "focus": true};
+
+                newTabViewLoader.setSource(source, properties);
+            }
+
+            Connections {
+                target: newTabViewLoader.item && !browser.incognito ? newTabViewLoader.item : null
+                onBookmarkClicked: {
+                    chrome.requestedUrl = url
+                    currentWebview.url = url
+                    tabContainer.forceActiveFocus()
+                }
+                onBookmarkRemoved: BookmarksModel.remove(url)
+                onHistoryEntryClicked: {
+                    chrome.requestedUrl = url
+                    currentWebview.url = url
+                    tabContainer.forceActiveFocus()
+                }
+            }
+            Keys.onUpPressed: chrome.focus = true
         }
 
         Loader {
@@ -328,8 +305,11 @@
             active: webProcessMonitor.crashed || (webProcessMonitor.killed && !currentWebview.loading)
             focus: active
 
-            sourceComponent: SadTab {
-                webview: currentWebview
+            Component.onCompleted: setSource("SadTab.qml", {
+                                                 "webview": Qt.binding(function () {return browser.currentWebview})
+                                             })
+            Connections {
+                target: sadTabLoader.item
                 onCloseTabRequested: internal.closeCurrentTab()
             }
 
@@ -477,7 +457,6 @@
         id: chrome
 
         tab: internal.nextTab || tabsModel.currentTab
-        webview: tab ? tab.webview : null
         tabsModel: browser.tabsModel
         searchUrl: currentSearchEngine.urlTemplate
 
@@ -800,7 +779,19 @@
 
         anchors.fill: parent
         active: false
-        sourceComponent: browser.wide ? bookmarksViewWideComponent : bookmarksViewComponent
+        asynchronous: true
+        Connections {
+            target: browser
+            onWideChanged: bookmarksViewLoader.selectBookmarksView()
+        }
+        Component.onCompleted: bookmarksViewLoader.selectBookmarksView()
+
+        function selectBookmarksView() {
+            bookmarksViewLoader.setSource(browser.wide ? "BookmarksViewWide.qml" : "BookmarksView.qml",
+                                          {"focus": true,
+                                           "homepageUrl": Qt.binding(function () {return settings.homepage})
+            });
+        }
 
         onStatusChanged: {
             if (status == Loader.Ready) {
@@ -824,26 +815,6 @@
                 bookmarksViewLoader.active = false
             }
         }
-
-        Component {
-            id: bookmarksViewComponent
-
-            BookmarksView {
-                anchors.fill: parent
-                focus: true
-                homepageUrl: settings.homepage
-            }
-        }
-
-        Component {
-            id: bookmarksViewWideComponent
-
-            BookmarksViewWide {
-                anchors.fill: parent
-                focus: true
-                homepageUrl: settings.homepage
-            }
-        }
     }
 
     Loader {
@@ -851,7 +822,34 @@
 
         anchors.fill: parent
         active: false
-        sourceComponent: browser.wide ? historyViewWideComponent : historyViewComponent
+        asynchronous: true
+        Connections {
+            target: browser
+            onWideChanged: historyViewLoader.selectHistoryView()
+        }
+        Component.onCompleted: historyViewLoader.selectHistoryView()
+
+        function selectHistoryView() {
+            historyViewLoader.setSource(browser.wide ? "HistoryViewWide.qml" : "HistoryViewWithExpansion.qml",
+                                        {"focus": true});
+        }
+
+        Connections {
+            target: historyViewLoader.item
+            onHistoryEntryClicked: {
+                historyViewLoader.active = false
+                internal.openUrlInNewTab(url, true)
+            }
+            onNewTabRequested: {
+                historyViewLoader.active = false
+                internal.openUrlInNewTab("", true)
+            }
+            onDone: {
+                historyViewLoader.active = false
+                internal.resetFocus()
+            }
+            onBack: historyViewLoader.active = false
+        }
 
         onStatusChanged: {
             if (status == Loader.Ready) {
@@ -862,75 +860,6 @@
                 internal.resetFocus()
             }
         }
-
-        Component {
-            id: historyViewComponent
-
-            FocusScope {
-                focus: true
-
-                signal loadModel()
-                onLoadModel: children[0].loadModel()
-
-                HistoryView {
-                    anchors.fill: parent
-                    focus: !expandedHistoryViewLoader.focus
-                    visible: focus
-                    onSeeMoreEntriesClicked: {
-                        expandedHistoryViewLoader.model = model
-                        expandedHistoryViewLoader.active = true
-                    }
-                    onNewTabRequested: internal.openUrlInNewTab("", true)
-                    onBack: historyViewLoader.active = false
-                }
-
-                Loader {
-                    id: expandedHistoryViewLoader
-                    asynchronous: true
-                    anchors.fill: parent
-                    active: false
-                    focus: active
-                    property var model: null
-                    sourceComponent: ExpandedHistoryView {
-                        focus: true
-                        model: expandedHistoryViewLoader.model
-                        onHistoryEntryClicked: {
-                            internal.openUrlInNewTab(url, true)
-                            historyViewLoader.active = false
-                        }
-                        onHistoryEntryRemoved: {
-                            if (count == 1) {
-                                done()
-                            }
-                            HistoryModel.removeEntryByUrl(url)
-                        }
-                        onDone: expandedHistoryViewLoader.active = false
-                    }
-                }
-            }
-        }
-
-        Component {
-            id: historyViewWideComponent
-
-            HistoryViewWide {
-                anchors.fill: parent
-                focus: true
-
-                onHistoryEntryClicked: {
-                    historyViewLoader.active = false
-                    internal.openUrlInNewTab(url, true)
-                }
-                onNewTabRequested: {
-                    historyViewLoader.active = false
-                    internal.openUrlInNewTab("", true)
-                }
-                onDone: {
-                    historyViewLoader.active = false
-                    internal.resetFocus()
-                }
-            }
-        }
     }
 
     Loader {
@@ -938,6 +867,7 @@
 
         anchors.fill: parent
         active: false
+        asynchronous: true
 
         onStatusChanged: {
             if (status == Loader.Ready) {
@@ -948,10 +878,12 @@
             }
         }
 
-        sourceComponent: SettingsPage {
-            anchors.fill: parent
-            focus: true
-            settingsObject: settings
+        Component.onCompleted: setSource("SettingsPage.qml", {
+                                             "focus": true,
+                                             "settingsObject": settings
+                                         })
+        Connections {
+            target: settingsViewLoader.item
             onDone: settingsViewLoader.active = false
         }
     }
@@ -961,18 +893,15 @@
 
         anchors.fill: parent
         active: false
-        source: "DownloadsPage.qml"
+        asynchronous: true
+        Component.onCompleted: {
+            setSource("DownloadsPage.qml", {
+                          "downloadManager": Qt.binding(function () {return downloadHandlerLoader.item}),
+                          "incognito": incognito,
+                          "focus": true
+            })
+        }
 
-        Binding {
-            target: downloadsViewLoader.item
-            property: "downloadManager"
-            value: downloadHandlerLoader.item
-        }
-        Binding {
-            target: downloadsViewLoader.item
-            property: "focus"
-            value: true
-        }
         Connections {
             target: downloadsViewLoader.item
             onDone: downloadsViewLoader.active = false
@@ -993,424 +922,10 @@
         asynchronous: true
     }
 
-    Component {
-        id: tabComponent
-
-        BrowserTab {
-            anchors.fill: parent
-            incognito: browser.incognito
-            current: tabsModel && tabsModel.currentTab === this
-            focus: current
-
-            Item {
-                id: contextualMenuTarget
-                visible: false
-            }
-
-            webviewComponent: WebViewImpl {
-                id: webviewimpl
-
-                property BrowserTab tab
-                readonly property bool current: tab.current
-
-                currentWebview: browser.currentWebview
-                filePicker: filePickerLoader.item
-
-                anchors.fill: parent
-
-                focus: true
-
-                enabled: current && !bottomEdgeHandle.dragging && !recentView.visible
-
-                locationBarController {
-                    height: chrome.height
-                    mode: chromeController.defaultMode
-                }
-
-                //experimental.preferences.developerExtrasEnabled: developerExtrasEnabled
-                preferences.localStorageEnabled: true
-                preferences.appCacheEnabled: true
-
-                property QtObject contextModel: null
-                contextualActions: ActionList {
-                    Actions.OpenLinkInNewTab {
-                        objectName: "OpenLinkInNewTabContextualAction"
-                        enabled: contextModel && contextModel.linkUrl.toString()
-                        onTriggered: internal.openUrlInNewTab(contextModel.linkUrl, true)
-                    }
-                    Actions.OpenLinkInNewBackgroundTab {
-                        objectName: "OpenLinkInNewBackgroundTabContextualAction"
-                        enabled: contextModel && contextModel.linkUrl.toString()
-                        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"
-                        enabled: contextModel && contextModel.linkUrl.toString()
-                                 && !BookmarksModel.contains(contextModel.linkUrl)
-                        onTriggered: {
-                            // position the menu target with a one-off assignement instead of a binding
-                            // since the contents of the contextModel have meaning only while the context
-                            // menu is active
-                            contextualMenuTarget.x = contextModel.position.x
-                            contextualMenuTarget.y = contextModel.position.y + locationBarController.height + locationBarController.offset
-                            internal.addBookmark(contextModel.linkUrl, contextModel.linkText,
-                                                 "", contextualMenuTarget)
-                        }
-                    }
-                    Actions.CopyLink {
-                        objectName: "CopyLinkContextualAction"
-                        enabled: contextModel && contextModel.linkUrl.toString()
-                        onTriggered: Clipboard.push(["text/plain", contextModel.linkUrl.toString()])
-                    }
-                    Actions.SaveLink {
-                        objectName: "SaveLinkContextualAction"
-                        enabled: contextModel && contextModel.linkUrl.toString()
-                        onTriggered: contextModel.saveLink()
-                    }
-                    Actions.Share {
-                        objectName: "ShareContextualAction"
-                        enabled: (contentHandlerLoader.status == Loader.Ready) && contextModel &&
-                                 (contextModel.linkUrl.toString() || contextModel.selectionText)
-                        onTriggered: {
-                            if (contextModel.linkUrl.toString()) {
-                                internal.shareLink(contextModel.linkUrl.toString(), contextModel.linkText)
-                            } else if (contextModel.selectionText) {
-                                internal.shareText(contextModel.selectionText)
-                            }
-                        }
-                    }
-                    Actions.OpenImageInNewTab {
-                        objectName: "OpenImageInNewTabContextualAction"
-                        enabled: contextModel &&
-                                 (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
-                                 contextModel.srcUrl.toString()
-                        onTriggered: internal.openUrlInNewTab(contextModel.srcUrl, true)
-                    }
-                    Actions.CopyImage {
-                        objectName: "CopyImageContextualAction"
-                        enabled: contextModel &&
-                                 (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
-                                 contextModel.srcUrl.toString()
-                        onTriggered: Clipboard.push(["text/plain", contextModel.srcUrl.toString()])
-                    }
-                    Actions.SaveImage {
-                        objectName: "SaveImageContextualAction"
-                        enabled: contextModel &&
-                                 ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
-                                  (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)) &&
-                                 contextModel.hasImageContents
-                        onTriggered: contextModel.saveMedia()
-                    }
-                    Actions.OpenVideoInNewTab {
-                        objectName: "OpenVideoInNewTabContextualAction"
-                        enabled: contextModel &&
-                                 (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) &&
-                                 contextModel.srcUrl.toString()
-                        onTriggered: internal.openUrlInNewTab(contextModel.srcUrl, true)
-                    }
-                    Actions.SaveVideo {
-                        objectName: "SaveVideoContextualAction"
-                        enabled: contextModel &&
-                                 (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) &&
-                                 contextModel.srcUrl.toString()
-                        onTriggered: contextModel.saveMedia()
-                    }
-                    Actions.Undo {
-                        objectName: "UndoContextualAction"
-                        enabled: contextModel && contextModel.isEditable &&
-                                 (contextModel.editFlags & Oxide.WebView.UndoCapability)
-                        onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandUndo)
-                    }
-                    Actions.Redo {
-                        objectName: "RedoContextualAction"
-                        enabled: contextModel && contextModel.isEditable &&
-                                 (contextModel.editFlags & Oxide.WebView.RedoCapability)
-                        onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandRedo)
-                    }
-                    Actions.Cut {
-                        objectName: "CutContextualAction"
-                        enabled: contextModel && contextModel.isEditable &&
-                                 (contextModel.editFlags & Oxide.WebView.CutCapability)
-                        onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandCut)
-                    }
-                    Actions.Copy {
-                        objectName: "CopyContextualAction"
-                        enabled: contextModel && (contextModel.selectionText ||
-                                 (contextModel.isEditable &&
-                                 (contextModel.editFlags & Oxide.WebView.CopyCapability)))
-                        onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandCopy)
-                    }
-                    Actions.Paste {
-                        objectName: "PasteContextualAction"
-                        enabled: contextModel && contextModel.isEditable &&
-                                 (contextModel.editFlags & Oxide.WebView.PasteCapability)
-                        onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandPaste)
-                    }
-                    Actions.Erase {
-                        objectName: "EraseContextualAction"
-                        enabled: contextModel && contextModel.isEditable &&
-                                 (contextModel.editFlags & Oxide.WebView.EraseCapability)
-                        onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandErase)
-                    }
-                    Actions.SelectAll {
-                        objectName: "SelectAllContextualAction"
-                        enabled: contextModel && contextModel.isEditable &&
-                                 (contextModel.editFlags & Oxide.WebView.SelectAllCapability)
-                        onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandSelectAll)
-                    }
-                }
-
-                function contextMenuOnCompleted(menu) {
-                    contextModel = menu.contextModel
-                    if (contextModel.linkUrl.toString() ||
-                        contextModel.srcUrl.toString() ||
-                        contextModel.selectionText ||
-                        (contextModel.isEditable && contextModel.editFlags) ||
-                        (((contextModel.mediaType == Oxide.WebView.MediaTypeImage) ||
-                          (contextModel.mediaType == Oxide.WebView.MediaTypeCanvas)) &&
-                         contextModel.hasImageContents)) {
-                        menu.show()
-                    } else {
-                        contextModel.close()
-                    }
-                }
-
-                Component {
-                    id: contextMenuNarrowComponent
-                    ContextMenuMobile {
-                        actions: contextualActions
-                        Component.onCompleted: webviewimpl.contextMenuOnCompleted(this)
-                    }
-                }
-                Component {
-                    id: contextMenuWideComponent
-                    ContextMenuWide {
-                        webview: webviewimpl
-                        parent: browser
-                        actions: contextualActions
-                        Component.onCompleted: webviewimpl.contextMenuOnCompleted(this)
-                    }
-                }
-                contextMenu: browser.wide ? contextMenuWideComponent : contextMenuNarrowComponent
-
-                onNewViewRequested: {
-                    var tab = tabComponent.createObject(tabContainer, {"request": request})
-                    var setCurrent = (request.disposition == Oxide.NewViewRequest.DispositionNewForegroundTab)
-                    internal.addTab(tab, setCurrent)
-                    if (setCurrent) tabContainer.forceActiveFocus()
-                }
-
-                onCloseRequested: prepareToClose()
-                onPrepareToCloseResponse: {
-                    if (proceed) {
-                        if (tab) {
-                            for (var i = 0; i < tabsModel.count; ++i) {
-                                if (tabsModel.get(i) === tab) {
-                                    tabsModel.remove(i)
-                                    break
-                                }
-                            }
-                            tab.close()
-                        }
-                        if (tabsModel.count === 0) {
-                            internal.openUrlInNewTab("", true, true)
-                        }
-                    }
-                }
-
-                QtObject {
-                    id: webviewInternal
-                    property url storedUrl: ""
-                    property bool titleSet: false
-                    property string title: ""
-                }
-                onLoadEvent: {
-                    if (event.type == Oxide.LoadEvent.TypeCommitted) {
-                        chrome.findInPageMode = false
-                        webviewInternal.titleSet = false
-                        webviewInternal.title = title
-                    }
-
-                    if (webviewimpl.incognito) {
-                        return
-                    }
-
-                    if ((event.type == Oxide.LoadEvent.TypeCommitted) &&
-                        !event.isError &&
-                        (300 > event.httpStatusCode) && (event.httpStatusCode >= 200)) {
-                        webviewInternal.storedUrl = event.url
-                        HistoryModel.add(event.url, title, icon)
-                    }
-                }
-                onTitleChanged: {
-                    if (!webviewInternal.titleSet && webviewInternal.storedUrl.toString()) {
-                        // Record the title to avoid updating the history database
-                        // every time the page dynamically updates its title.
-                        // We don’t want pages that update their title every second
-                        // to achieve an ugly "scrolling title" effect to flood the
-                        // history database with updates.
-                        webviewInternal.titleSet = true
-                        webviewInternal.title = title
-                        HistoryModel.update(webviewInternal.storedUrl, title, icon)
-                    }
-                }
-                onIconChanged: {
-                    if (webviewInternal.storedUrl.toString()) {
-                        HistoryModel.update(webviewInternal.storedUrl, webviewInternal.title, icon)
-                    }
-                }
-
-                onGeolocationPermissionRequested: requestGeolocationPermission(request)
-
-                property var certificateError
-                function resetCertificateError() {
-                    certificateError = null
-                }
-                onCertificateError: {
-                    if (!error.isMainFrame || error.isSubresource) {
-                        // Not a main frame document error, just block the content
-                        // (it’s not overridable anyway).
-                        return
-                    }
-                    if (internal.isCertificateErrorAllowed(error)) {
-                        error.allow()
-                    } else {
-                        certificateError = error
-                        error.onCancelled.connect(webviewimpl.resetCertificateError)
-                    }
-                }
-
-                onFullscreenChanged: {
-                    if (fullscreen) {
-                        fullscreenExitHintComponent.createObject(webviewimpl)
-                    }
-                }
-                Component {
-                    id: fullscreenExitHintComponent
-
-                    Rectangle {
-                        id: fullscreenExitHint
-                        objectName: "fullscreenExitHint"
-
-                        anchors.centerIn: parent
-                        height: units.gu(6)
-                        width: Math.min(units.gu(50), parent.width - units.gu(12))
-                        radius: units.gu(1)
-                        color: "#3e3b39"
-                        opacity: 0.85
-
-                        Behavior on opacity {
-                            UbuntuNumberAnimation {
-                                duration: UbuntuAnimation.SlowDuration
-                            }
-                        }
-                        onOpacityChanged: {
-                            if (opacity == 0.0) {
-                                fullscreenExitHint.destroy()
-                            }
-                        }
-
-                        // Delay showing the hint to prevent it from jumping up while the
-                        // webview is being resized (https://launchpad.net/bugs/1454097).
-                        visible: false
-                        Timer {
-                            running: true
-                            interval: 250
-                            onTriggered: fullscreenExitHint.visible = true
-                        }
-
-                        Label {
-                            color: "white"
-                            font.weight: Font.Light
-                            anchors.centerIn: parent
-                            text: bottomEdgeHandle.enabled
-                                      ? i18n.tr("Swipe Up To Exit Full Screen")
-                                      : i18n.tr("Press ESC To Exit Full Screen")
-                        }
-
-                        Timer {
-                            running: fullscreenExitHint.visible
-                            interval: 2000
-                            onTriggered: fullscreenExitHint.opacity = 0
-                        }
-
-                        Connections {
-                            target: webviewimpl
-                            onFullscreenChanged: {
-                                if (!webviewimpl.fullscreen) {
-                                    fullscreenExitHint.destroy()
-                                }
-                            }
-                        }
-
-                        Component.onCompleted: bottomEdgeHint.forceShow = true
-                        Component.onDestruction: bottomEdgeHint.forceShow = false
-                    }
-                }
-
-                onShowDownloadDialog: {
-                    if (downloadDialogLoader.status === Loader.Ready) {
-                        var downloadDialog = PopupUtils.open(downloadDialogLoader.item, browser, {"contentType" : contentType,
-                                                                                                  "downloadId" : downloadId,
-                                                                                                  "singleDownload" : downloader,
-                                                                                                  "filename" : filename,
-                                                                                                  "mimeType" : mimeType})
-                        downloadDialog.startDownload.connect(startDownload)
-                    }
-                }
-
-                function showDownloadsPage() {
-                    downloadsViewLoader.active = true
-                    return downloadsViewLoader.item
-                }
-
-                function startDownload(downloadId, download, mimeType) {
-                    DownloadsModel.add(downloadId, download.url, mimeType)
-                    download.start()
-                    downloadsViewLoader.active = true
-                }
-
-            }
-        }
-    }
-
-    Component {
-        id: bookmarkOptionsComponent
-        BookmarkOptions {
-            folderModel: BookmarksFolderListModel {
-                sourceModel: BookmarksModel
-            }
-
-            Component.onCompleted: forceActiveFocus()
-
-            onVisibleChanged: {
-                if (!visible) {
-                    BookmarksModel.remove(bookmarkUrl)
-                }
-            }
-
-            Component.onDestruction: {
-                if (BookmarksModel.contains(bookmarkUrl)) {
-                    BookmarksModel.update(bookmarkUrl, bookmarkTitle, bookmarkFolder)
-                }
-            }
-
-            // Fragile workaround for https://launchpad.net/bugs/1546677.
-            // By destroying the popover, its visibility isn’t changed to
-            // false, and thus the bookmark is not removed.
-            Keys.onEnterPressed: destroy()
-            Keys.onReturnPressed: destroy()
-        }
+    property Component tabComponent
+    Loader {
+        source: "TabComponent.qml"
+        onLoaded: tabComponent = item
     }
 
     QtObject {
@@ -1513,6 +1028,7 @@
                 var tabInfo = closedTabHistory.pop()
                 var tab = restoreTabState(tabInfo.state)
                 addTab(tab, true, tabInfo.index)
+                tab.load()
             }
         }
 
@@ -1621,7 +1137,7 @@
             BookmarksModel.add(url, title, icon, "")
             if (location === undefined) location = chrome.bookmarkTogglePlaceHolder
             var properties = {"bookmarkUrl": url, "bookmarkTitle": title}
-            currentBookmarkOptionsDialog = PopupUtils.open(bookmarkOptionsComponent,
+            internal.currentBookmarkOptionsDialog = PopupUtils.open(Qt.resolvedUrl("BookmarkOptions.qml"),
                                                            location, properties)
         }
     }
 
=== modified file 'src/app/webbrowser/BrowserTab.qml'
--- src/app/webbrowser/BrowserTab.qml	2016-08-11 11:19:40 +0000
+++ src/app/webbrowser/BrowserTab.qml	2016-10-13 14:41:36 +0000
@@ -193,9 +193,10 @@
         }
     }
     Connections {
-        target: webview
-        onLoadingStateChanged: {
-            if (!webview.loading && !webview.incognito) {
+        target: incognito ? null : webview
+        onLoadEvent: {
+            if ((event.type == Oxide.LoadEvent.TypeSucceeded) ||
+                (event.type == Oxide.LoadEvent.TypeFailed)) {
                 delayedCapture.restart()
             }
         }
 
=== modified file 'src/app/webbrowser/Chrome.qml'
--- src/app/webbrowser/Chrome.qml	2016-02-09 22:01:57 +0000
+++ src/app/webbrowser/Chrome.qml	2016-10-13 14:41:36 +0000
@@ -25,6 +25,7 @@
 
     property var tabsModel
     property alias tab: navigationBar.tab
+    readonly property var webview: tab ? tab.webview : null
     property alias searchUrl: navigationBar.searchUrl
     property alias text: navigationBar.text
     property alias bookmarked: navigationBar.bookmarked
@@ -69,15 +70,23 @@
         Loader {
             id: tabsBar
 
-            sourceComponent: TabsBar {
-                model: tabsModel
-                incognito: chrome.incognito
-                fgColor: navigationBar.fgColor
-                touchEnabled: chrome.touchEnabled
+            Component.onCompleted: {
+                tabsBar.setSource("TabsBar.qml", {
+                                      "model": Qt.binding(function () {return chrome.tabsModel}),
+                                      "incognito": Qt.binding(function () {return chrome.incognito}),
+                                      "fgColor": Qt.binding(function () {return navigationBar.fgColor}),
+                                      "touchEnabled": Qt.binding(function () {return chrome.touchEnabled})
+                })
+            }
+
+            Connections {
+                target: tabsBar.item
+
                 onSwitchToTab: chrome.switchToTab(index)
                 onRequestNewTab: chrome.requestNewTab(index, makeCurrent)
                 onTabClosed: chrome.tabClosed(index)
             }
+            asynchronous: true
 
             anchors {
                 top: parent.top
@@ -90,6 +99,7 @@
         NavigationBar {
             id: navigationBar
 
+            loading: chrome.loading
             fgColor: "#111111"
             iconColor: (incognito && !showTabsBar) ? "white" : fgColor
 
@@ -105,4 +115,19 @@
             onToggleBookmark: chrome.toggleBookmark()
         }
     }
+
+    // Delay changing the 'loading' state, to allow for very brief load
+    // sequences to not update the UI, which would result in inelegant
+    // flickering (https://launchpad.net/bugs/1611680).
+    Connections {
+        target: webview
+        onLoadingStateChanged: delayedLoadingNotifier.restart()
+    }
+    Timer {
+        id: delayedLoadingNotifier
+        interval: 100
+        onTriggered: loading = webview.loading
+    }
+
+    loadProgress: (loading && webview) ? webview.loadProgress : 0
 }
 
=== modified file 'src/app/webbrowser/DownloadDelegate.qml'
--- src/app/webbrowser/DownloadDelegate.qml	2016-05-23 02:52:50 +0000
+++ src/app/webbrowser/DownloadDelegate.qml	2016-10-13 14:41:36 +0000
@@ -25,7 +25,7 @@
 
     property var downloadManager
 
-    property alias icon: mimeicon.name
+    property string icon
     property alias image: thumbimage.source
     property alias title: title.text
     property alias url: url.text
@@ -33,15 +33,16 @@
     property bool incomplete: false
     property string downloadId
     property var download
-    property int progress: download ? download.progress : 0
+    readonly property int progress: download ? download.progress : 0
     property bool paused
+    property alias incognito: incognitoIcon.visible
 
     divider.visible: false
 
     signal removed()
     signal cancelled()
 
-    height: visible ? (incomplete ? (paused ? units.gu(13) : units.gu(10)) : units.gu(7)) : 0
+    height: visible ? layout.height : 0
 
     QtObject {
         id: internal
@@ -60,165 +61,167 @@
     Component.onCompleted: internal.connectToDownloadObject()
     onDownloadManagerChanged: internal.connectToDownloadObject()
 
-    Item {
-        
-        anchors {
-            verticalCenter: parent.verticalCenter
-            left: parent.left
-            leftMargin: units.gu(2)
-            right: parent.right
-            rightMargin: units.gu(2)
-        }
+    SlotsLayout {
+        id: layout
 
         Item {
-            id: iconContainer
+            SlotsLayout.position: SlotsLayout.Leading
             width: units.gu(3)
-            height: width
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.verticalCenterOffset: downloadDelegate.incomplete ? -units.gu(1) : 0
+            height: units.gu(3)
 
             Image {
                 id: thumbimage
                 asynchronous: true
-                width: parent.width
-                height: parent.height
+                anchors.fill: parent
                 fillMode: Image.PreserveAspectFit
-                sourceSize.width: parent.width
-                sourceSize.height: parent.height
-                anchors.verticalCenter: parent.verticalCenter
+                sourceSize.width: width
+                sourceSize.height: height
             }
 
             Image {
-                id: mimeicon
                 asynchronous: true
                 anchors.fill: parent
                 anchors.margins: units.gu(0.2)
-                source: "image://theme/%1".arg(name != "" ? name : "save")
+                source: "image://theme/%1".arg(downloadDelegate.icon || "save")
                 visible: thumbimage.status !== Image.Ready
                 cache: true
-                property string name
-            }
-        }
-
-        Item {
-            anchors.top: iconContainer.top
-            anchors.left: iconContainer.right
-            anchors.leftMargin: units.gu(2)
-            anchors.right: parent.right
-
-            Column {
-                id: detailsColumn
-                width: parent.width - cancelColumn.width
-                height: parent.height
-
-                Label {
-                    id: title
-                    fontSize: "x-small"
-                    color: "#5d5d5d"
-                    elide: Text.ElideRight
-                    width: parent.width
-                }
-
-                Label {
-                    id: url
-                    fontSize: "x-small"
-                    color: "#5d5d5d"
-                    elide: Text.ElideRight
-                    width: parent.width
-                }
-
-                Item {
-                    height: error.visible ? units.gu(1) : units.gu(2)
-                    width: parent.width
-                    visible: downloadDelegate.incomplete
-                }
-
-                Item {
-                    id: error
-                    visible: incomplete && download === undefined || errorMessage !== ""
-                    height: units.gu(3)
-                    width: parent.width
-
-                    Icon {
-                        id: errorIcon
-                        width: units.gu(2)
-                        height: width
-                        anchors.verticalCenter: parent.verticalCenter
-                        name: "dialog-warning-symbolic"
-                        color: theme.palette.normal.negative
-                    }
-
-                    Label {
-                        width: parent.width - errorIcon.width
-                        anchors.left: errorIcon.right
-                        anchors.leftMargin: units.gu(1)
-                        anchors.verticalCenter: errorIcon.verticalCenter
-                        fontSize: "x-small"
-                        color: theme.palette.normal.negative
-                        text: errorMessage !== "" ? errorMessage 
-                                                  : (incomplete && download === undefined) ? i18n.tr("Download failed") 
-                                                                                           : ""
-                        elide: Text.ElideRight
-                    }
-                }
-
-                IndeterminateProgressBar {
-                    id: progressBar
-                    width: parent.width
-                    height: units.gu(0.5)
-                    visible: downloadDelegate.incomplete && !error.visible
-                    progress: downloadDelegate.progress
-                    // Work around UDM bug #1450144
-                    indeterminateProgress: downloadDelegate.progress < 0 || downloadDelegate.progress > 100
-                }
-            }
-
-            Column {
-                id: cancelColumn
-                spacing: units.gu(1)
-                anchors.top: detailsColumn.top
-                anchors.left: detailsColumn.right
-                anchors.leftMargin: units.gu(2)
-                width: downloadDelegate.incomplete && !error.visible ? cancelButton.width + units.gu(2) : 0
-
-                Button {
-                    visible: downloadDelegate.incomplete && !error.visible
-                    id: cancelButton
-                    text: i18n.tr("Cancel")
-                    onClicked: {
-                        if (download) {
-                            download.cancel()
-                            cancelled()
-                        }
-                    }
-                }
-
-                Label {
-                    visible: !progressBar.indeterminateProgress && downloadDelegate.incomplete
-                                                                && !error.visible 
-                                                                && !downloadDelegate.paused
-                    width: cancelButton.width
-                    horizontalAlignment: Text.AlignHCenter
-                    fontSize: "x-small"
-                    text: progressBar.progress + "%"
-                }
-
-                Button {
-                    visible: downloadDelegate.paused
-                    text: i18n.tr("Resume")
-                    width: cancelButton.width
-                    onClicked: {
-                        if (download) {
-                            download.resume()
-                        }
-                    }
-                }
-            }
-
-        }
-    }
-
-    leadingActions: error.visible || !downloadDelegate.incomplete ? deleteActionList : null
+            }
+        }
+
+        mainSlot: Column {
+            Label {
+                id: title
+                fontSize: "x-small"
+                color: "#5d5d5d"
+                elide: Text.ElideRight
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+            }
+
+            Label {
+                id: url
+                fontSize: "x-small"
+                color: "#5d5d5d"
+                elide: Text.ElideRight
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+            }
+
+            Item {
+                height: error.visible ? units.gu(1) : units.gu(2)
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                visible: incomplete
+            }
+
+            Item {
+                id: error
+                visible: (incomplete && (download === undefined)) || errorMessage
+                height: units.gu(3)
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Icon {
+                    id: errorIcon
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    anchors.verticalCenter: parent.verticalCenter
+                    name: "dialog-warning-symbolic"
+                    color: theme.palette.normal.negative
+                }
+
+                Label {
+                    anchors {
+                        left: errorIcon.right
+                        leftMargin: units.gu(1)
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                    }
+                    fontSize: "x-small"
+                    color: theme.palette.normal.negative
+                    text: errorMessage ||
+                          ((incomplete && download === undefined) ? i18n.tr("Download failed") : "")
+                    elide: Text.ElideRight
+                }
+            }
+
+            IndeterminateProgressBar {
+                id: progressBar
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: units.gu(0.5)
+                visible: incomplete && !error.visible
+                progress: downloadDelegate.progress
+                // Work around UDM bug #1450144
+                indeterminateProgress: progress < 0 || progress > 100
+            }
+        }
+
+        Column {
+            SlotsLayout.position: SlotsLayout.Trailing
+            spacing: units.gu(1)
+            width: (incomplete && !error.visible) ? cancelButton.width : 0
+
+            Button {
+                id: cancelButton
+                visible: incomplete && !error.visible
+                text: i18n.tr("Cancel")
+                onClicked: {
+                    if (download) {
+                        download.cancel()
+                        cancelled()
+                    }
+                }
+            }
+
+            Label {
+                visible: !progressBar.indeterminateProgress && incomplete
+                            && !error.visible && !paused
+                width: cancelButton.width
+                horizontalAlignment: Text.AlignHCenter
+                fontSize: "x-small"
+                // TRANSLATORS: %1 is the percentage of the download completed so far
+                text: i18n.tr("%1%").arg(progressBar.progress)
+            }
+
+            Button {
+                visible: paused
+                text: i18n.tr("Resume")
+                width: cancelButton.width
+                onClicked: {
+                    if (download) {
+                        download.resume()
+                    }
+                }
+            }
+        }
+    }
+
+    Icon {
+        id: incognitoIcon
+        anchors {
+            right: parent.right
+            rightMargin: units.gu(2)
+            bottom: parent.bottom
+            bottomMargin: units.gu(1)
+        }
+        width: units.gu(2)
+        height: units.gu(2)
+        asynchronous: true
+        name: "private-browsing"
+    }
+
+    leadingActions: error.visible || !incomplete ? deleteActionList : null
 
     ListItemActions {
         id: deleteActionList
@@ -226,9 +229,8 @@
             Action {
                 objectName: "leadingAction.delete"
                 iconName: "delete"
-                enabled: error.visible || !downloadDelegate.incomplete
-                onTriggered: error.visible ? downloadDelegate.cancelled() 
-                                           : downloadDelegate.removed()
+                enabled: error.visible || !incomplete
+                onTriggered: error.visible ? cancelled() : removed()
             }
         ]
     }
 
=== modified file 'src/app/webbrowser/DownloadsPage.qml'
--- src/app/webbrowser/DownloadsPage.qml	2016-06-06 09:09:47 +0000
+++ src/app/webbrowser/DownloadsPage.qml	2016-10-13 14:41:36 +0000
@@ -39,6 +39,7 @@
     property bool pickingMode
     property bool multiSelect
     property alias mimetypeFilter: downloadModelFilter.pattern
+    property bool incognito: false
 
     signal done()
 
@@ -154,8 +155,14 @@
         focus: !exportPeerPicker.focus
 
         model: SortFilterModel {
-            model: DownloadsModel
-            filter { 
+            model: SortFilterModel {
+                model: DownloadsModel
+                filter {
+                    property: "incognito"
+                    pattern: RegExp(downloadsItem.incognito ? "" : "^false$")
+                }
+            }
+            filter {
                 id: downloadModelFilter
                 property: "mimetype"
             }
@@ -197,6 +204,7 @@
             visible: !(selectMode && incomplete)
             errorMessage: model.error
             paused: model.paused
+            incognito: model.incognito
 
             onClicked: {
                 if (model.complete && !selectMode) {
 
=== added file 'src/app/webbrowser/HistoryViewWithExpansion.qml'
--- src/app/webbrowser/HistoryViewWithExpansion.qml	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/HistoryViewWithExpansion.qml	2016-10-13 14:41:36 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2014-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
+
+FocusScope {
+    id: historyViewWithExpansion
+
+    function loadModel() {
+        historyView.loadModel()
+    }
+
+    signal newTabRequested()
+    signal historyEntryClicked(url url)
+    signal done()
+    signal back()
+
+    HistoryView {
+        id: historyView
+        anchors.fill: parent
+        focus: !expandedHistoryViewLoader.focus
+        visible: focus
+        onSeeMoreEntriesClicked: {
+            expandedHistoryViewLoader.model = model
+            expandedHistoryViewLoader.active = true
+        }
+        onNewTabRequested: historyViewWithExpansion.newTabRequested()
+        onBack: historyViewWithExpansion.back()
+    }
+    
+    Loader {
+        id: expandedHistoryViewLoader
+        asynchronous: true
+        anchors.fill: parent
+        active: false
+        focus: active
+        property var model: null
+        sourceComponent: ExpandedHistoryView {
+            focus: true
+            model: expandedHistoryViewLoader.model
+            onHistoryEntryClicked: historyViewWithExpansion.historyEntryClicked(url)
+            onHistoryEntryRemoved: {
+                if (count == 1) {
+                    done()
+                }
+                HistoryModel.removeEntryByUrl(url)
+            }
+            onDone: expandedHistoryViewLoader.active = false
+        }
+    }
+}
 
=== modified file 'src/app/webbrowser/NavigationBar.qml'
--- src/app/webbrowser/NavigationBar.qml	2016-05-17 17:23:42 +0000
+++ src/app/webbrowser/NavigationBar.qml	2016-10-13 14:41:36 +0000
@@ -24,6 +24,7 @@
     id: root
 
     property var tab
+    property alias loading: addressbar.loading
     property alias searchUrl: addressbar.searchUrl
     readonly property string text: addressbar.text
     property alias bookmarked: addressbar.bookmarked
@@ -122,8 +123,6 @@
 
             icon: (internal.webview && internal.webview.certificateError) ? "" : tab ? tab.icon : ""
 
-            loading: internal.webview ? internal.webview.loading : false
-
             onValidated: {
                 if (!findInPageMode) {
                     internal.webview.forceActiveFocus()
@@ -138,15 +137,8 @@
             onToggleBookmark: root.toggleBookmark()
 
             Connections {
-                target: internal.webview
-                onUrlChanged: {
-                    // ensure that the URL actually changes so that the
-                    // address bar is updated in case the user has entered a
-                    // new address that redirects to where she previously was
-                    // (https://launchpad.net/bugs/1306615)
-                    addressbar.actualUrl = ""
-                    addressbar.actualUrl = internal.webview.url
-                }
+                target: tab
+                onUrlChanged: addressbar.actualUrl = tab.url
             }
         }
 
 
=== added file 'src/app/webbrowser/TabComponent.qml'
--- src/app/webbrowser/TabComponent.qml	1970-01-01 00:00:00 +0000
+++ src/app/webbrowser/TabComponent.qml	2016-10-13 14:41:36 +0000
@@ -0,0 +1,436 @@
+/*
+ * Copyright 2014-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
+import com.canonical.Oxide 1.15 as Oxide
+import webbrowserapp.private 0.1
+import "../actions" as Actions
+import ".."
+
+// FIXME: This component breaks encapsulation: it uses variables not defined in
+// itself. However this is an acceptable tradeoff with regards to
+// startup time performance. Indeed having this component defined as a separate
+// QML file as opposed to inline makes it possible to cache its compiled form.
+
+Component {
+    id: tabComponent
+
+    BrowserTab {
+        anchors.fill: parent
+        incognito: browser.incognito
+        current: tabsModel && tabsModel.currentTab === this
+        focus: current
+
+        Item {
+            id: contextualMenuTarget
+            visible: false
+        }
+
+        webviewComponent: WebViewImpl {
+            id: webviewimpl
+
+            property BrowserTab tab
+            readonly property bool current: tab.current
+
+            currentWebview: browser.currentWebview
+            filePicker: filePickerLoader.item
+
+            anchors.fill: parent
+
+            focus: true
+
+            enabled: current && !bottomEdgeHandle.dragging && !recentView.visible && tabContainer.focus
+
+            locationBarController {
+                height: chrome.height
+                mode: chromeController.defaultMode
+            }
+
+            //experimental.preferences.developerExtrasEnabled: developerExtrasEnabled
+            preferences.localStorageEnabled: true
+            preferences.appCacheEnabled: true
+
+            property QtObject contextModel: null
+            contextualActions: ActionList {
+                Actions.OpenLinkInNewTab {
+                    objectName: "OpenLinkInNewTabContextualAction"
+                    enabled: contextModel && contextModel.linkUrl.toString()
+                    onTriggered: internal.openUrlInNewTab(contextModel.linkUrl, true)
+                }
+                Actions.OpenLinkInNewBackgroundTab {
+                    objectName: "OpenLinkInNewBackgroundTabContextualAction"
+                    enabled: contextModel && contextModel.linkUrl.toString()
+                    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"
+                    enabled: contextModel && contextModel.linkUrl.toString()
+                             && !BookmarksModel.contains(contextModel.linkUrl)
+                    onTriggered: {
+                        // position the menu target with a one-off assignement instead of a binding
+                        // since the contents of the contextModel have meaning only while the context
+                        // menu is active
+                        contextualMenuTarget.x = contextModel.position.x
+                        contextualMenuTarget.y = contextModel.position.y + locationBarController.height + locationBarController.offset
+                        internal.addBookmark(contextModel.linkUrl, contextModel.linkText,
+                                             "", contextualMenuTarget)
+                    }
+                }
+                Actions.CopyLink {
+                    objectName: "CopyLinkContextualAction"
+                    enabled: contextModel && contextModel.linkUrl.toString()
+                    onTriggered: Clipboard.push(["text/plain", contextModel.linkUrl.toString()])
+                }
+                Actions.SaveLink {
+                    objectName: "SaveLinkContextualAction"
+                    enabled: contextModel && contextModel.linkUrl.toString()
+                    onTriggered: contextModel.saveLink()
+                }
+                Actions.Share {
+                    objectName: "ShareContextualAction"
+                    enabled: (contentHandlerLoader.status == Loader.Ready) && contextModel &&
+                             (contextModel.linkUrl.toString() || contextModel.selectionText)
+                    onTriggered: {
+                        if (contextModel.linkUrl.toString()) {
+                            internal.shareLink(contextModel.linkUrl.toString(), contextModel.linkText)
+                        } else if (contextModel.selectionText) {
+                            internal.shareText(contextModel.selectionText)
+                        }
+                    }
+                }
+                Actions.OpenImageInNewTab {
+                    objectName: "OpenImageInNewTabContextualAction"
+                    enabled: contextModel &&
+                             (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
+                             contextModel.srcUrl.toString()
+                    onTriggered: internal.openUrlInNewTab(contextModel.srcUrl, true)
+                }
+                Actions.CopyImage {
+                    objectName: "CopyImageContextualAction"
+                    enabled: contextModel &&
+                             (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
+                             contextModel.srcUrl.toString()
+                    onTriggered: Clipboard.push(["text/plain", contextModel.srcUrl.toString()])
+                }
+                Actions.SaveImage {
+                    objectName: "SaveImageContextualAction"
+                    enabled: contextModel &&
+                             ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
+                              (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)) &&
+                             contextModel.hasImageContents
+                    onTriggered: contextModel.saveMedia()
+                }
+                Actions.OpenVideoInNewTab {
+                    objectName: "OpenVideoInNewTabContextualAction"
+                    enabled: contextModel &&
+                             (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) &&
+                             contextModel.srcUrl.toString()
+                    onTriggered: internal.openUrlInNewTab(contextModel.srcUrl, true)
+                }
+                Actions.SaveVideo {
+                    objectName: "SaveVideoContextualAction"
+                    enabled: contextModel &&
+                             (contextModel.mediaType === Oxide.WebView.MediaTypeVideo) &&
+                             contextModel.srcUrl.toString()
+                    onTriggered: contextModel.saveMedia()
+                }
+                Actions.Undo {
+                    objectName: "UndoContextualAction"
+                    enabled: contextModel && contextModel.isEditable &&
+                             (contextModel.editFlags & Oxide.WebView.UndoCapability)
+                    onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandUndo)
+                }
+                Actions.Redo {
+                    objectName: "RedoContextualAction"
+                    enabled: contextModel && contextModel.isEditable &&
+                             (contextModel.editFlags & Oxide.WebView.RedoCapability)
+                    onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandRedo)
+                }
+                Actions.Cut {
+                    objectName: "CutContextualAction"
+                    enabled: contextModel && contextModel.isEditable &&
+                             (contextModel.editFlags & Oxide.WebView.CutCapability)
+                    onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandCut)
+                }
+                Actions.Copy {
+                    objectName: "CopyContextualAction"
+                    enabled: contextModel && (contextModel.selectionText ||
+                                              (contextModel.isEditable &&
+                                               (contextModel.editFlags & Oxide.WebView.CopyCapability)))
+                    onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandCopy)
+                }
+                Actions.Paste {
+                    objectName: "PasteContextualAction"
+                    enabled: contextModel && contextModel.isEditable &&
+                             (contextModel.editFlags & Oxide.WebView.PasteCapability)
+                    onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandPaste)
+                }
+                Actions.Erase {
+                    objectName: "EraseContextualAction"
+                    enabled: contextModel && contextModel.isEditable &&
+                             (contextModel.editFlags & Oxide.WebView.EraseCapability)
+                    onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandErase)
+                }
+                Actions.SelectAll {
+                    objectName: "SelectAllContextualAction"
+                    enabled: contextModel && contextModel.isEditable &&
+                             (contextModel.editFlags & Oxide.WebView.SelectAllCapability)
+                    onTriggered: webviewimpl.executeEditingCommand(Oxide.WebView.EditingCommandSelectAll)
+                }
+            }
+
+            function contextMenuOnCompleted(menu) {
+                contextModel = menu.contextModel
+                if (contextModel.linkUrl.toString() ||
+                        contextModel.srcUrl.toString() ||
+                        contextModel.selectionText ||
+                        (contextModel.isEditable && contextModel.editFlags) ||
+                        (((contextModel.mediaType == Oxide.WebView.MediaTypeImage) ||
+                          (contextModel.mediaType == Oxide.WebView.MediaTypeCanvas)) &&
+                         contextModel.hasImageContents)) {
+                    menu.show()
+                } else {
+                    contextModel.close()
+                }
+            }
+
+            Component {
+                id: contextMenuNarrowComponent
+                ContextMenuMobile {
+                    actions: contextualActions
+                    Component.onCompleted: webviewimpl.contextMenuOnCompleted(this)
+                }
+            }
+            Component {
+                id: contextMenuWideComponent
+                ContextMenuWide {
+                    webview: webviewimpl
+                    parent: browser
+                    actions: contextualActions
+                    Component.onCompleted: webviewimpl.contextMenuOnCompleted(this)
+                }
+            }
+            contextMenu: browser.wide ? contextMenuWideComponent : contextMenuNarrowComponent
+
+            onNewViewRequested: {
+                var tab = tabComponent.createObject(tabContainer, {"request": request})
+                var setCurrent = (request.disposition == Oxide.NewViewRequest.DispositionNewForegroundTab)
+                internal.addTab(tab, setCurrent)
+                if (setCurrent) tabContainer.forceActiveFocus()
+            }
+
+            onCloseRequested: prepareToClose()
+            onPrepareToCloseResponse: {
+                if (proceed) {
+                    if (tab) {
+                        for (var i = 0; i < tabsModel.count; ++i) {
+                            if (tabsModel.get(i) === tab) {
+                                tabsModel.remove(i)
+                                break
+                            }
+                        }
+                        tab.close()
+                    }
+                    if (tabsModel.count === 0) {
+                        internal.openUrlInNewTab("", true, true)
+                    }
+                }
+            }
+
+            QtObject {
+                id: webviewInternal
+                property url storedUrl: ""
+                property bool titleSet: false
+                property string title: ""
+            }
+            onLoadEvent: {
+                if (event.type == Oxide.LoadEvent.TypeCommitted) {
+                    chrome.findInPageMode = false
+                    webviewInternal.titleSet = false
+                    webviewInternal.title = title
+                }
+
+                if (webviewimpl.incognito) {
+                    return
+                }
+
+                if ((event.type == Oxide.LoadEvent.TypeCommitted) &&
+                        !event.isError &&
+                        (300 > event.httpStatusCode) && (event.httpStatusCode >= 200)) {
+                    webviewInternal.storedUrl = event.url
+                    HistoryModel.add(event.url, title, icon)
+                }
+
+                // If the page has started, stopped, redirected, errored
+                // then clear the cache for the history update
+                // Otherwise if no title change has occurred the next title
+                // change will be the url of the next page causing the
+                // history entry to be incorrect (pad.lv/1603835)
+                if (event.type == Oxide.LoadEvent.TypeFailed ||
+                        event.type == Oxide.LoadEvent.TypeRedirected ||
+                        event.type == Oxide.LoadEvent.TypeStarted ||
+                        event.type == Oxide.LoadEvent.TypeStopped) {
+                    webviewInternal.titleSet = true
+                    webviewInternal.storedUrl = ""
+                }
+            }
+            onTitleChanged: {
+                if (!webviewInternal.titleSet && webviewInternal.storedUrl.toString()) {
+                    // Record the title to avoid updating the history database
+                    // every time the page dynamically updates its title.
+                    // We don’t want pages that update their title every second
+                    // to achieve an ugly "scrolling title" effect to flood the
+                    // history database with updates.
+                    webviewInternal.titleSet = true
+                    if (webviewInternal.title != title) {
+                        webviewInternal.title = title
+                        HistoryModel.update(webviewInternal.storedUrl, title, icon)
+                    }
+                }
+            }
+            onIconChanged: {
+                if (webviewInternal.storedUrl.toString()) {
+                    HistoryModel.update(webviewInternal.storedUrl, webviewInternal.title, icon)
+                }
+            }
+
+            onGeolocationPermissionRequested: requestGeolocationPermission(request)
+
+            property var certificateError
+            function resetCertificateError() {
+                certificateError = null
+            }
+            onCertificateError: {
+                if (!error.isMainFrame || error.isSubresource) {
+                    // Not a main frame document error, just block the content
+                    // (it’s not overridable anyway).
+                    return
+                }
+                if (internal.isCertificateErrorAllowed(error)) {
+                    error.allow()
+                } else {
+                    certificateError = error
+                    error.onCancelled.connect(webviewimpl.resetCertificateError)
+                }
+            }
+
+            onFullscreenChanged: {
+                if (fullscreen) {
+                    fullscreenExitHintComponent.createObject(webviewimpl)
+                }
+            }
+            Component {
+                id: fullscreenExitHintComponent
+
+                Rectangle {
+                    id: fullscreenExitHint
+                    objectName: "fullscreenExitHint"
+
+                    anchors.centerIn: parent
+                    height: units.gu(6)
+                    width: Math.min(units.gu(50), parent.width - units.gu(12))
+                    radius: units.gu(1)
+                    color: "#3e3b39"
+                    opacity: 0.85
+
+                    Behavior on opacity {
+                        UbuntuNumberAnimation {
+                            duration: UbuntuAnimation.SlowDuration
+                        }
+                    }
+                    onOpacityChanged: {
+                        if (opacity == 0.0) {
+                            fullscreenExitHint.destroy()
+                        }
+                    }
+
+                    // Delay showing the hint to prevent it from jumping up while the
+                    // webview is being resized (https://launchpad.net/bugs/1454097).
+                    visible: false
+                    Timer {
+                        running: true
+                        interval: 250
+                        onTriggered: fullscreenExitHint.visible = true
+                    }
+
+                    Label {
+                        color: "white"
+                        font.weight: Font.Light
+                        anchors.centerIn: parent
+                        text: bottomEdgeHandle.enabled
+                              ? i18n.tr("Swipe Up To Exit Full Screen")
+                              : i18n.tr("Press ESC To Exit Full Screen")
+                    }
+
+                    Timer {
+                        running: fullscreenExitHint.visible
+                        interval: 2000
+                        onTriggered: fullscreenExitHint.opacity = 0
+                    }
+
+                    Connections {
+                        target: webviewimpl
+                        onFullscreenChanged: {
+                            if (!webviewimpl.fullscreen) {
+                                fullscreenExitHint.destroy()
+                            }
+                        }
+                    }
+
+                    Component.onCompleted: bottomEdgeHint.forceShow = true
+                    Component.onDestruction: bottomEdgeHint.forceShow = false
+                }
+            }
+
+            onShowDownloadDialog: {
+                if (downloadDialogLoader.status === Loader.Ready) {
+                    var downloadDialog = PopupUtils.open(downloadDialogLoader.item, browser, {"contentType" : contentType,
+                                                             "downloadId" : downloadId,
+                                                             "singleDownload" : downloader,
+                                                             "filename" : filename,
+                                                             "mimeType" : mimeType})
+                    downloadDialog.startDownload.connect(startDownload)
+                }
+            }
+
+            function showDownloadsPage() {
+                downloadsViewLoader.active = true
+                return downloadsViewLoader.item
+            }
+
+            function startDownload(downloadId, download, mimeType) {
+                DownloadsModel.add(downloadId, download.url, mimeType, incognito)
+                download.start()
+                downloadsViewLoader.active = true
+            }
+
+        }
+    }
+}
 
=== modified file 'src/app/webbrowser/TabItem.qml'
--- src/app/webbrowser/TabItem.qml	2016-07-01 08:52:37 +0000
+++ src/app/webbrowser/TabItem.qml	2016-10-13 14:41:36 +0000
@@ -22,6 +22,7 @@
 
 Item {
     id: tabItem
+    objectName: "tabItem"
 
     property bool incognito: false
     property bool active: false
@@ -38,6 +39,8 @@
     property color fgColor: Theme.palette.normal.baseText
 
     property bool touchEnabled: true
+    
+    readonly property bool showCloseIcon: closeIcon.x > units.gu(1) + tabItem.width / 2
 
     signal selected()
     signal closed()
@@ -54,10 +57,17 @@
 
         Favicon {
             id: favicon
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.leftMargin: units.gu(2)
+            anchors {
+                left: tabItem.showCloseIcon ? parent.left : undefined
+                leftMargin: Math.min(tabItem.width / 4, units.gu(2))
+                horizontalCenter: tabItem.showCloseIcon ? undefined : parent.horizontalCenter
+                verticalCenter: parent.verticalCenter
+            }
             shouldCache: !incognito
+            
+            // Scale width and height of favicon when tabWidth becomes small
+            height: width
+            width: Math.min(units.dp(16), Math.min(tabItem.width - anchors.leftMargin * 2, tabItem.height))
         }
 
         Item {
@@ -132,6 +142,7 @@
             anchors.bottom: touchEnabled ? parent.bottom : undefined
             anchors.right: touchEnabled ? parent.right : undefined
             width: touchEnabled ? units.gu(4) : closeIcon.width
+            visible: closeIcon.visible
 
             onClicked: closed()
 
@@ -149,9 +160,10 @@
             anchors.right: parent.right
             anchors.rightMargin: units.gu(1)
             anchors.verticalCenter: parent.verticalCenter
+            asynchronous: true
             name: "close"
             color: tabItem.fgColor
-            asynchronous: true
+            visible: tabItem.showCloseIcon
         }
     }
 }
 
=== 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-10-13 14:41:36 +0000
@@ -30,6 +30,18 @@
     property real maxTabWidth: units.gu(20)
     property real tabWidth: model ? Math.max(Math.min(tabsContainer.maxWidth / model.count, maxTabWidth), minTabWidth) : 0
 
+    // Minimum size of the larger tab
+    readonly property real minActiveTabWidth: units.gu(10)
+    
+    // When there is a larger tab, calc the smaller tab size
+    readonly property real nonActiveTabWidth: (tabsContainer.maxWidth - minActiveTabWidth) / Math.max(model.count - 1, 1)
+
+    // The size of the right margin of the tab
+    readonly property real rightMargin: units.dp(1)
+                
+    // Whether there will be one larger tab or not
+    readonly property bool unevenTabWidth: tabWidth + rightMargin < minActiveTabWidth
+
     property bool incognito: false
 
     property color fgColor: Theme.palette.normal.baseText
@@ -130,8 +142,8 @@
                 readonly property int tabIndex: index
 
                 anchors.top: tabsContainer.top
-                property real rightMargin: units.dp(1)
-                width: tabWidth + rightMargin
+                
+                width: getSize(index)
                 height: tabsContainer.height
 
                 acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
@@ -156,7 +168,7 @@
 
                     touchEnabled: root.touchEnabled
 
-                    rightMargin: tabDelegate.rightMargin
+                    rightMargin: root.rightMargin
 
                     onClosed: root.tabClosed(index)
                     onSelected: root.switchToTab(index)
@@ -168,19 +180,52 @@
                     property: "reordering"
                     value: dragging
                 }
+                
+                Behavior on width { NumberAnimation { duration: 250 } }
 
                 Binding on x {
                     when: !dragging
-                    value: index * width
+                    value: getLeftX(index)
                 }
 
                 Behavior on x { NumberAnimation { duration: 250 } }
 
+                function getLeftX(index) {
+                    if (unevenTabWidth) {
+                        if (index > root.model.currentIndex) {
+                            return minActiveTabWidth + (nonActiveTabWidth * (index - 1))
+                        } else {
+                            return nonActiveTabWidth * index
+                        }
+                    } else {
+                        // Do not depend on width otherwise X updates after
+                        // Width causing the animation to be two stage
+                        // instead perform same calculation (tabWidth + rightMargin)
+                        return index * (tabWidth + rightMargin)
+                    }
+                }
+                
+                function getSize(index) {
+                    if (unevenTabWidth) {
+                        // Uneven tabs so use large or small depending which index
+                        if (index === root.model.currentIndex) {
+                            return minActiveTabWidth
+                        } else {
+                            return nonActiveTabWidth
+                        }
+                    } else {
+                        return tabWidth + rightMargin
+                    }
+                }
+                
                 onXChanged: {
                     if (!dragging) return
-                    if (x < (index * width - width / 2)) {
+
+                    var leftX = getLeftX(index)
+
+                    if (x < (leftX - getSize(index - 1) / 2) && index > 0) {
                         root.model.move(index, index - 1)
-                    } else if ((x > (index * width + width / 2)) && (index < (root.model.count - 1))) {
+                    } else if ((x > (leftX + getSize(index + 1) / 2)) && (index < (root.model.count - 1))) {
                         root.model.move(index + 1, index)
                     }
                 }
 
=== modified file 'src/app/webbrowser/downloads-model.cpp'
--- src/app/webbrowser/downloads-model.cpp	2016-07-06 09:31:57 +0000
+++ src/app/webbrowser/downloads-model.cpp	2016-10-13 14:41:36 +0000
@@ -104,6 +104,7 @@
     int count = 0; // size() isn't supported on the sqlite backend
     while (populateQuery.next()) {
         DownloadEntry entry;
+        entry.incognito = false;
         entry.downloadId = populateQuery.value(0).toString();
         entry.url = populateQuery.value(1).toUrl();
         entry.path = populateQuery.value(2).toString();
@@ -147,6 +148,7 @@
         roles[Paused] = "paused";
         roles[Error] = "error";
         roles[Created] = "created";
+        roles[Incognito] = "incognito";
     }
     return roles;
 }
@@ -182,6 +184,8 @@
         return entry.error;
     case Created:
         return entry.created;
+    case Incognito:
+        return entry.incognito;
     default:
         return QVariant();
     }
@@ -218,7 +222,7 @@
     Add a download to the database. This should happen as soon as the download
     is started.
 */
-void DownloadsModel::add(const QString& downloadId, const QUrl& url, const QString& mimetype)
+void DownloadsModel::add(const QString& downloadId, const QUrl& url, const QString& mimetype, bool incognito)
 {
     beginInsertRows(QModelIndex(), 0, 0);
     DownloadEntry entry;
@@ -227,83 +231,111 @@
     entry.paused = false;
     entry.url = url;
     entry.mimetype = mimetype;
+    entry.incognito = incognito;
     m_orderedEntries.prepend(entry);
     m_numRows++;
-    m_fetchedCount++;
     endInsertRows();
-    Q_EMIT added(downloadId, url, mimetype);
-    insertNewEntryInDatabase(entry);
     Q_EMIT rowCountChanged();
-}
-
-void DownloadsModel::setPath(const QString& downloadId, const QString& path)
-{
-    QSqlQuery query(m_database);
-
-    // Override reported mimetype from server with detected mimetype from file once downloaded
-    QMimeDatabase mimeDatabase;
-    QString mimetype = mimeDatabase.mimeTypeForFile(path).name();
-
-    static QString updateStatement = QLatin1String("UPDATE downloads SET mimetype = ?, "
-                                                   "path = ? WHERE downloadId = ?");
-    query.prepare(updateStatement);
-    query.addBindValue(mimetype);
-    query.addBindValue(path);
-    query.addBindValue(downloadId);
-    query.exec();
-    Q_EMIT pathChanged(downloadId, path);
+    if (!incognito) {
+        insertNewEntryInDatabase(entry);
+        m_fetchedCount++;
+    }
 }
 
 void DownloadsModel::setComplete(const QString& downloadId, const bool complete)
 {
-    QSqlQuery query(m_database);
-    static QString updateStatement = QLatin1String("UPDATE downloads SET complete = ? "
-                                                   "WHERE downloadId = ?");
-    query.prepare(updateStatement);
-    query.addBindValue(complete);
-    query.addBindValue(downloadId);
-    query.exec();
-    Q_EMIT completeChanged(downloadId, complete);
-    reload();
+    int index = getIndexForDownloadId(downloadId);
+    if (index != -1) {
+        DownloadEntry& entry = m_orderedEntries[index];
+        if (entry.complete == complete) {
+            return;
+        }
+        entry.complete = complete;
+        Q_EMIT dataChanged(this->index(index, 0), this->index(index, 0), QVector<int>() << Complete);
+        if (!entry.incognito) {
+            QSqlQuery query(m_database);
+            static QString updateStatement = QLatin1String("UPDATE downloads SET complete=? WHERE downloadId=?;");
+            query.prepare(updateStatement);
+            query.addBindValue(complete);
+            query.addBindValue(downloadId);
+            query.exec();
+        }
+    }
 }
 
 void DownloadsModel::setError(const QString& downloadId, const QString& error)
 {
-    QSqlQuery query(m_database);
-    static QString updateStatement = QLatin1String("UPDATE downloads SET error = ? "
-                                                   "WHERE downloadId = ?");
-    query.prepare(updateStatement);
-    query.addBindValue(error);
-    query.addBindValue(downloadId);
-    query.exec();
-    Q_EMIT errorChanged(downloadId, error);
-    reload();
+    int index = getIndexForDownloadId(downloadId);
+    if (index != -1) {
+        DownloadEntry& entry = m_orderedEntries[index];
+        if (entry.error == error) {
+            return;
+        }
+        entry.error = error;
+        Q_EMIT dataChanged(this->index(index, 0), this->index(index, 0), QVector<int>() << Error);
+        if (!entry.incognito) {
+            QSqlQuery query(m_database);
+            static QString updateStatement = QLatin1String("UPDATE downloads SET error=? WHERE downloadId=?;");
+            query.prepare(updateStatement);
+            query.addBindValue(error);
+            query.addBindValue(downloadId);
+            query.exec();
+        }
+    }
 }
 
 void DownloadsModel::moveToDownloads(const QString& downloadId, const QString& path)
 {
+    int index = getIndexForDownloadId(downloadId);
+    if (index == -1) {
+        return;
+    }
     QFile file(path);
     if (file.exists()) {
         QFileInfo fi(path);
-        QString suffix = fi.completeSuffix();
-        QString filename = fi.fileName();
-        QString filenameWithoutSuffix = filename.left(filename.size() - suffix.size());
+        DownloadEntry& entry = m_orderedEntries[index];
+        QVector<int> updatedRoles;
+
+        // Override reported mimetype from server with detected mimetype from file once downloaded
+        QMimeDatabase mimeDatabase;
+        QString mimetype = mimeDatabase.mimeTypeForFile(fi).name();
+        if (mimetype != entry.mimetype) {
+            entry.mimetype = mimetype;
+            updatedRoles.append(Mimetype);
+        }
+
+        // Move file to XDG Downloads folder
         QDir dir(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
         if (!dir.exists()) {
             QDir::root().mkpath(dir.absolutePath());
         }
-        QString destination = dir.absoluteFilePath(filenameWithoutSuffix + suffix);
+        QString baseName = fi.baseName();
+        QString suffix = fi.completeSuffix();
+        QString destination = dir.absoluteFilePath(QString("%1.%2").arg(baseName, suffix));
         // Avoid filename collision by automatically inserting an incremented
         // number into the filename if the original name already exists.
         int append = 1;
         while (QFile::exists(destination)) {
-            destination = dir.absoluteFilePath(QString("%1%2.%3").arg(filenameWithoutSuffix, QString::number(append++), suffix));
+            destination = dir.absoluteFilePath(QString("%1.%2.%3").arg(baseName, QString::number(append++), suffix));
         }
         if (file.rename(destination)) {
-            setPath(downloadId, destination);
+            entry.path = destination;
+            updatedRoles.append(Path);
         } else {
             qWarning() << "Failed moving file from" << path << "to" << destination;
         }
+
+        Q_EMIT dataChanged(this->index(index, 0), this->index(index, 0), updatedRoles);
+        if (!entry.incognito && !updatedRoles.isEmpty()) {
+            QSqlQuery query(m_database);
+            static QString updateStatement = QLatin1String("UPDATE downloads SET mimetype = ?, "
+                                                           "path = ? WHERE downloadId = ?");
+            query.prepare(updateStatement);
+            query.addBindValue(mimetype);
+            query.addBindValue(destination);
+            query.addBindValue(downloadId);
+            query.exec();
+        }
     } else {
         qWarning() << "Download not found:" << path;
     }
@@ -331,15 +363,17 @@
     int index = 0;
     Q_FOREACH(DownloadEntry entry, m_orderedEntries) {
         if (entry.path == path) {
+            bool incognito = entry.incognito;
             beginRemoveRows(QModelIndex(), index, index);
             m_orderedEntries.removeAt(index);
             endRemoveRows();
-            Q_EMIT deleted(path);
-            removeExistingEntryFromDatabase(path);
-            m_fetchedCount--;
             m_numRows--;
             Q_EMIT rowCountChanged();
             QFile::remove(path);
+            if (!incognito) {
+                removeExistingEntryFromDatabase(path);
+                m_fetchedCount--;
+            }
             return;
         } else {
             index++;
@@ -352,45 +386,69 @@
 */
 void DownloadsModel::cancelDownload(const QString& downloadId)
 {
-    int index=0;
-    Q_FOREACH(DownloadEntry entry, m_orderedEntries) {
-        if (entry.downloadId == downloadId) {
-            beginRemoveRows(QModelIndex(), index, index);
-            m_orderedEntries.removeAt(index);
+    int index = getIndexForDownloadId(downloadId);
+    if (index != -1) {
+        const DownloadEntry& entry = m_orderedEntries.at(index);
+        bool incognito = entry.incognito;
+        beginRemoveRows(QModelIndex(), index, index);
+        m_orderedEntries.removeAt(index);
+        endRemoveRows();
+        m_numRows--;
+        Q_EMIT rowCountChanged();
+        if (!incognito) {
             QSqlQuery query(m_database);
             static QString deleteStatement = QLatin1String("DELETE FROM downloads WHERE downloadId=?;");
             query.prepare(deleteStatement);
             query.addBindValue(downloadId);
             query.exec();
-            endRemoveRows();
             m_fetchedCount--;
-            m_numRows--;
-            Q_EMIT rowCountChanged();
+        }
+    }
+}
+
+void DownloadsModel::setPaused(const QString& downloadId, bool paused)
+{
+    int index = getIndexForDownloadId(downloadId);
+    if (index != -1) {
+        DownloadEntry& entry = m_orderedEntries[index];
+        if (entry.paused == paused) {
             return;
-        } else {
-            index++;
+        }
+        entry.paused = paused;
+        Q_EMIT dataChanged(this->index(index, 0), this->index(index, 0), QVector<int>() << Paused);
+        if (!entry.incognito) {
+            QSqlQuery query(m_database);
+            static QString pauseStatement = QLatin1String("UPDATE downloads SET paused=? WHERE downloadId=?;");
+            query.prepare(pauseStatement);
+            query.addBindValue(paused);
+            query.addBindValue(downloadId);
+            query.exec();
         }
     }
 }
 
 void DownloadsModel::pauseDownload(const QString& downloadId)
 {
-    QSqlQuery query(m_database);
-    static QString pauseStatement = QLatin1String("UPDATE downloads SET paused=1 WHERE downloadId=?;");
-    query.prepare(pauseStatement);
-    query.addBindValue(downloadId);
-    query.exec();
-    reload();
+    setPaused(downloadId, true);
 }
 
 void DownloadsModel::resumeDownload(const QString& downloadId)
 {
-    QSqlQuery query(m_database);
-    static QString resumeStatement = QLatin1String("UPDATE downloads SET paused=0 WHERE downloadId=?;");
-    query.prepare(resumeStatement);
-    query.addBindValue(downloadId);
-    query.exec();
-    reload();
+    setPaused(downloadId, false);
+}
+
+void DownloadsModel::pruneIncognitoDownloads()
+{
+    for (int i = m_orderedEntries.size() - 1; i >= 0; --i) {
+        const DownloadEntry& entry = m_orderedEntries.at(i);
+        if (entry.incognito) {
+            beginRemoveRows(QModelIndex(), i, i);
+            m_orderedEntries.removeAt(i);
+            endRemoveRows();
+            m_numRows--;
+            Q_EMIT rowCountChanged();
+        }
+    }
 }
 
 void DownloadsModel::removeExistingEntryFromDatabase(const QString& path)
@@ -409,14 +467,15 @@
     return m_canFetchMore;
 }
 
-void DownloadsModel::reload()
+int DownloadsModel::getIndexForDownloadId(const QString& downloadId) const
 {
-    beginResetModel();
-    m_orderedEntries.clear();
-    m_canFetchMore = true;
-    m_fetchedCount = 0;
-    m_numRows = 0;
-    endResetModel();
-    fetchMore();
-    Q_EMIT rowCountChanged();
+    int index = 0;
+    Q_FOREACH(const DownloadEntry& entry, m_orderedEntries) {
+        if (entry.downloadId == downloadId) {
+            return index;
+        } else {
+            ++index;
+        }
+    }
+    return -1;
 }
 
=== modified file 'src/app/webbrowser/downloads-model.h'
--- src/app/webbrowser/downloads-model.h	2016-01-12 10:37:15 +0000
+++ src/app/webbrowser/downloads-model.h	2016-10-13 14:41:36 +0000
@@ -49,7 +49,8 @@
         Complete,
         Paused,
         Error,
-        Created
+        Created,
+        Incognito
     };
 
     // reimplemented from QAbstractListModel
@@ -63,23 +64,18 @@
     void setDatabasePath(const QString& path);
 
     Q_INVOKABLE bool contains(const QString& downloadId) const;
-    Q_INVOKABLE void add(const QString& downloadId, const QUrl& url, const QString& mimetype);
+    Q_INVOKABLE void add(const QString& downloadId, const QUrl& url, const QString& mimetype, bool incognito);
     Q_INVOKABLE void moveToDownloads(const QString& downloadId, const QString& path);
-    Q_INVOKABLE void setPath(const QString& downloadId, const QString& path);
     Q_INVOKABLE void setComplete(const QString& downloadId, const bool complete);
     Q_INVOKABLE void setError(const QString& downloadId, const QString& error);
     Q_INVOKABLE void deleteDownload(const QString& path);
     Q_INVOKABLE void cancelDownload(const QString& downloadId);
     Q_INVOKABLE void pauseDownload(const QString& downloadId);
     Q_INVOKABLE void resumeDownload(const QString& downloadId);
+    Q_INVOKABLE void pruneIncognitoDownloads();
 
 Q_SIGNALS:
     void databasePathChanged() const;
-    void added(const QString& downloadId, const QUrl& url, const QString& mimetype) const;
-    void pathChanged(const QString& downloadId, const QString& path) const;
-    void completeChanged(const QString& downloadId, const bool complete) const;
-    void errorChanged(const QString& downloadId, const QString& error) const;
-    void deleted(const QString& path) const;
     void rowCountChanged();
 
 private:
@@ -98,6 +94,7 @@
         bool paused;
         QString error;
         QDateTime created;
+        bool incognito;
     };
     QList<DownloadEntry> m_orderedEntries;
 
@@ -105,7 +102,8 @@
     void createOrAlterDatabaseSchema();
     void insertNewEntryInDatabase(const DownloadEntry& entry);
     void removeExistingEntryFromDatabase(const QString& path);
-    void reload();
+    void setPaused(const QString& downloadId, bool paused);
+    int getIndexForDownloadId(const QString& downloadId) const;
 };
 
 #endif // __DOWNLOADS_MODEL_H__
 
=== modified file 'src/app/webbrowser/history-model.cpp'
--- src/app/webbrowser/history-model.cpp	2016-03-01 09:30:41 +0000
+++ src/app/webbrowser/history-model.cpp	2016-10-13 14:41:36 +0000
@@ -20,10 +20,12 @@
 #include "history-model.h"
 
 // Qt
-#include <QtCore/QMutexLocker>
+#include <QtCore/QTimer>
+#include <QtCore/QWriteLocker>
 #include <QtSql/QSqlQuery>
 
-#define CONNECTION_NAME "webbrowser-app-history"
+#define SQL_DRIVER QStringLiteral("QSQLITE")
+#define CONNECTION_NAME QStringLiteral("webbrowser-app-history")
 
 /*!
     \class HistoryModel
@@ -39,18 +41,31 @@
     The database is read at startup to populate the model, and whenever a new
     entry is added to the model the database is updated.
     However the model doesn’t monitor the database for external changes.
+    All database operations are performed on a separate thread in order not to
+    block the UI thread.
 */
 HistoryModel::HistoryModel(QObject* parent)
     : QAbstractListModel(parent)
 {
-    m_database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), CONNECTION_NAME);
+    m_dbWorker = new DbWorker;
+    m_dbWorker->moveToThread(&m_dbWorkerThread);
+    connect(m_dbWorker, SIGNAL(hiddenEntryFetched(const QUrl&)),
+            SLOT(onHiddenEntryFetched(const QUrl&)), Qt::QueuedConnection);
+    connect(m_dbWorker,
+            SIGNAL(entryFetched(const QUrl&, const QString&, const QString&,
+                                const QUrl&, int, const QDateTime&)),
+            SLOT(onEntryFetched(const QUrl&, const QString&, const QString&,
+                                const QUrl&, int, const QDateTime&)),
+            Qt::QueuedConnection);
+    connect(m_dbWorker, SIGNAL(loaded()), SIGNAL(loaded()));
+    m_dbWorkerThread.start(QThread::LowPriority);
 }
 
 HistoryModel::~HistoryModel()
 {
-    m_database.close();
-    m_database = QSqlDatabase();
-    QSqlDatabase::removeDatabase(CONNECTION_NAME);
+    m_dbWorker->deleteLater();
+    m_dbWorkerThread.quit();
+    m_dbWorkerThread.wait();
 }
 
 void HistoryModel::resetDatabase(const QString& databaseName)
@@ -58,85 +73,35 @@
     beginResetModel();
     m_hiddenEntries.clear();
     m_entries.clear();
-    m_database.close();
-    m_database.setDatabaseName(databaseName);
-    m_database.open();
-    createOrAlterDatabaseSchema();
+    Q_EMIT m_dbWorker->resetDatabase(databaseName);
     endResetModel();
-    populateFromDatabase();
-}
-
-void HistoryModel::createOrAlterDatabaseSchema()
-{
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery createQuery(m_database);
-    QString query = QLatin1String("CREATE TABLE IF NOT EXISTS history "
-                                  "(url VARCHAR, domain VARCHAR, title VARCHAR,"
-                                  " icon VARCHAR, visits INTEGER, lastVisit DATETIME);");
-    createQuery.prepare(query);
-    createQuery.exec();
-
-    // The first version of the database schema didn’t have a 'domain' column
-    QSqlQuery tableInfoQuery(m_database);
-    query = QLatin1String("PRAGMA TABLE_INFO(history);");
-    tableInfoQuery.prepare(query);
-    tableInfoQuery.exec();
-    while (tableInfoQuery.next()) {
-        if (tableInfoQuery.value("name").toString() == "domain") {
-            break;
-        }
-    }
-    if (!tableInfoQuery.isValid()) {
-        QSqlQuery addDomainColumnQuery(m_database);
-        query = QLatin1String("ALTER TABLE history ADD COLUMN domain VARCHAR;");
-        addDomainColumnQuery.prepare(query);
-        addDomainColumnQuery.exec();
-        // Updating all the entries in the database to add the domain is a
-        // costly operation that would slow down the application startup,
-        // do not do it here.
-    }
-
-    QSqlQuery createHiddenQuery(m_database);
-    query = QLatin1String("CREATE TABLE IF NOT EXISTS history_hidden (url VARCHAR);");
-    createHiddenQuery.prepare(query);
-    createHiddenQuery.exec();
-}
-
-void HistoryModel::populateFromDatabase()
-{
-    QSqlQuery populateQuery(m_database);
-    QString query = QLatin1String("SELECT url, domain, title, icon, visits, lastVisit "
-                                  "FROM history ORDER BY lastVisit DESC;");
-    populateQuery.prepare(query);
-    populateQuery.exec();
-
-    QSqlQuery populateHiddenQuery(m_database);
-    query = QLatin1String("SELECT url FROM history_hidden;");
-    populateHiddenQuery.prepare(query);
-    populateHiddenQuery.exec();
-
-    while (populateHiddenQuery.next()) {
-        m_hiddenEntries.append(populateHiddenQuery.value(0).toUrl());
-    }
-
-    int count = 0;
-    while (populateQuery.next()) {
-        HistoryEntry entry;
-        entry.url = populateQuery.value(0).toUrl();
-        entry.domain = populateQuery.value(1).toString();
-        if (entry.domain.isEmpty()) {
-            entry.domain = DomainUtils::extractTopLevelDomainName(entry.url);
-        }
-        entry.title = populateQuery.value(2).toString();
-        entry.icon = populateQuery.value(3).toUrl();
-        entry.visits = populateQuery.value(4).toInt();
-        entry.lastVisit = QDateTime::fromTime_t(populateQuery.value(5).toInt());
-        entry.hidden = m_hiddenEntries.contains(entry.url);
-        beginInsertRows(QModelIndex(), count, count);
-        m_entries.append(entry);
-        endInsertRows();
-        ++count;
-    }
+    Q_EMIT m_dbWorker->fetchEntries();
+}
+
+void HistoryModel::onHiddenEntryFetched(const QUrl& url)
+{
+    m_hiddenEntries.insert(url);
+}
+
+void HistoryModel::onEntryFetched(const QUrl& url, const QString& domain, const QString& title,
+                                  const QUrl& icon, int visits, const QDateTime& lastVisit)
+{
+    HistoryEntry entry;
+    entry.url = url;
+    if (domain.isEmpty()) {
+        entry.domain = DomainUtils::extractTopLevelDomainName(url);
+    } else {
+        entry.domain = domain;
+    }
+    entry.title = title;
+    entry.icon = icon;
+    entry.visits = visits;
+    entry.lastVisit = lastVisit;
+    entry.hidden = m_hiddenEntries.contains(url);
+    int index = m_entries.count();
+    beginInsertRows(QModelIndex(), index, index);
+    m_entries.append(entry);
+    endInsertRows();
 }
 
 QHash<int, QByteArray> HistoryModel::roleNames() const
@@ -194,12 +159,13 @@
 
 const QString HistoryModel::databasePath() const
 {
-    return m_database.databaseName();
+    return m_databasePath;
 }
 
 void HistoryModel::setDatabasePath(const QString& path)
 {
-    if (path != databasePath()) {
+    if (path != m_databasePath) {
+        m_databasePath = path;
         if (path.isEmpty()) {
             resetDatabase(":memory:");
         } else {
@@ -399,86 +365,55 @@
 
 void HistoryModel::insertNewEntryInDatabase(const HistoryEntry& entry)
 {
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery query(m_database);
-    static QString insertStatement = QLatin1String("INSERT INTO history (url, domain, title, icon, "
-                                                   "visits, lastVisit) VALUES (?, ?, ?, ?, 1, ?);");
-    query.prepare(insertStatement);
-    query.addBindValue(entry.url.toString());
-    query.addBindValue(entry.domain);
-    query.addBindValue(entry.title);
-    query.addBindValue(entry.icon.toString());
-    query.addBindValue(entry.lastVisit.toTime_t());
-    query.exec();
+    QVariantList values;
+    values << entry.url.toString();
+    values << entry.domain;
+    values << entry.title;
+    values << entry.icon.toString();
+    values << entry.lastVisit.toTime_t();
+    Q_EMIT m_dbWorker->enqueue(DbWorker::InsertNewEntry, values);
 }
 
 void HistoryModel::insertNewEntryInHiddenDatabase(const QUrl& url)
 {
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery query(m_database);
-    static QString insertStatement = QLatin1String("INSERT INTO history_hidden (url) VALUES (?);");
-    query.prepare(insertStatement);
-    query.addBindValue(url.toString());
-    query.exec();
+    Q_EMIT m_dbWorker->enqueue(DbWorker::InsertNewHiddenEntry, QVariantList() << url.toString());
 }
 
 void HistoryModel::updateExistingEntryInDatabase(const HistoryEntry& entry)
 {
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery query(m_database);
-    static QString updateStatement = QLatin1String("UPDATE history SET domain=?, title=?, icon=?, "
-                                                   "visits=?, lastVisit=? WHERE url=?;");
-    query.prepare(updateStatement);
-    query.addBindValue(entry.domain);
-    query.addBindValue(entry.title);
-    query.addBindValue(entry.icon.toString());
-    query.addBindValue(entry.visits);
-    query.addBindValue(entry.lastVisit.toTime_t());
-    query.addBindValue(entry.url.toString());
-    query.exec();
+    QVariantList values;
+    values << entry.domain;
+    values << entry.title;
+    values << entry.icon.toString();
+    values << entry.visits;
+    values << entry.lastVisit.toTime_t();
+    values << entry.url.toString();
+    Q_EMIT m_dbWorker->enqueue(DbWorker::UpdateExistingEntry, values);
 }
 
 void HistoryModel::removeEntryFromDatabaseByUrl(const QUrl& url)
 {
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery query(m_database);
-    static QString deleteStatement = QLatin1String("DELETE FROM history WHERE url=?;");
-    query.prepare(deleteStatement);
-    query.addBindValue(url.toString());
-    query.exec();
+    Q_EMIT m_dbWorker->enqueue(DbWorker::RemoveEntryByUrl, QVariantList() << url.toString());
 }
 
 void HistoryModel::removeEntryFromHiddenDatabaseByUrl(const QUrl& url)
 {
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery query(m_database);
-    static QString deleteStatement = QLatin1String("DELETE FROM history_hidden WHERE url=?;");
-    query.prepare(deleteStatement);
-    query.addBindValue(url.toString());
-    query.exec();
+    Q_EMIT m_dbWorker->enqueue(DbWorker::RemoveHiddenEntryByUrl, QVariantList() << url.toString());
 }
 
 void HistoryModel::removeEntriesFromDatabaseByDate(const QDate& date)
 {
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery query(m_database);
-    static QString deleteStatement = QLatin1String("DELETE FROM history WHERE lastVisit BETWEEN ? AND ?;");
-    query.prepare(deleteStatement);
+    QVariantList values;
     QDateTime dateTime = QDateTime(date);
-    query.addBindValue(dateTime.toTime_t());
+    values << dateTime.toTime_t();
     dateTime.setTime(QTime(23, 59, 59, 999));
-    query.addBindValue(dateTime.toTime_t());
-    query.exec();
+    values << dateTime.toTime_t();
+    Q_EMIT m_dbWorker->enqueue(DbWorker::RemoveEntriesByDate, values);
 }
 
 void HistoryModel::removeEntriesFromDatabaseByDomain(const QString& domain)
 {
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery query(m_database);
-    static QString deleteStatement = QLatin1String("DELETE FROM history WHERE domain=?;");
-    query.prepare(deleteStatement);
-    query.addBindValue(domain);
-    query.exec();
+    Q_EMIT m_dbWorker->enqueue(DbWorker::RemoveEntriesByDomain, QVariantList() << domain);
 }
 
 void HistoryModel::clearAll()
@@ -495,16 +430,8 @@
 
 void HistoryModel::clearDatabase()
 {
-    QMutexLocker ml(&m_dbMutex);
-    QSqlQuery deleteQuery(m_database);
-    QString deleteStatement = QLatin1String("DELETE FROM history;");
-    deleteQuery.prepare(deleteStatement);
-    deleteQuery.exec();
-
-    QSqlQuery deleteHiddenQuery(m_database);
-    deleteStatement = QLatin1String("DELETE FROM history_hidden;");
-    deleteHiddenQuery.prepare(deleteStatement);
-    deleteHiddenQuery.exec();
+    Q_EMIT m_dbWorker->enqueue(DbWorker::Clear, QVariantList() << QStringLiteral("history"));
+    Q_EMIT m_dbWorker->enqueue(DbWorker::Clear, QVariantList() << QStringLiteral("history_hidden"));
 }
 
 /*!
@@ -519,7 +446,7 @@
         return;
     }
 
-    m_hiddenEntries.append(url);
+    m_hiddenEntries.insert(url);
 
     QVector<int> roles;
     roles << Hidden;
@@ -547,7 +474,7 @@
         return;
     }
 
-    m_hiddenEntries.removeAll(url);
+    m_hiddenEntries.remove(url);
 
     QVector<int> roles;
     roles << Hidden;
@@ -577,3 +504,175 @@
     }
     return item;
 }
+
+DbWorker::DbWorker()
+    : QObject()
+    , m_flush(nullptr)
+{
+    // Ensure all database operations are performed on the same thread
+    connect(this, SIGNAL(resetDatabase(const QString&)),
+            SLOT(doResetDatabase(const QString&)), Qt::QueuedConnection);
+    connect(this, SIGNAL(fetchEntries()),
+            SLOT(doFetchEntries()), Qt::QueuedConnection);
+    qRegisterMetaType<Operation>("Operation");
+    connect(this, SIGNAL(enqueue(Operation, QVariantList)),
+            SLOT(doEnqueue(Operation, QVariantList)), Qt::QueuedConnection);
+}
+
+DbWorker::~DbWorker()
+{
+    if (m_flush) {
+        m_flush->stop();
+        delete m_flush;
+        m_flush = nullptr;
+    }
+    doFlush();
+    if (m_database.isOpen()) {
+        m_database.close();
+    }
+    m_database = QSqlDatabase();
+    QSqlDatabase::removeDatabase(CONNECTION_NAME);
+}
+
+void DbWorker::doResetDatabase(const QString& databaseName)
+{
+    if (m_flush) {
+        m_flush->stop();
+        delete m_flush;
+        m_flush = nullptr;
+    }
+    doFlush();
+    if (m_database.isOpen()) {
+        m_database.close();
+    }
+    if (!m_database.isValid()) {
+         m_database = QSqlDatabase::addDatabase(SQL_DRIVER, CONNECTION_NAME);
+    }
+    m_database.setDatabaseName(databaseName);
+    m_database.open();
+    doCreateOrAlterDatabaseSchema();
+}
+
+void DbWorker::doCreateOrAlterDatabaseSchema()
+{
+    QSqlQuery createQuery(m_database);
+    QString query = QStringLiteral("CREATE TABLE IF NOT EXISTS history "
+                                   "(url VARCHAR, domain VARCHAR, title VARCHAR,"
+                                   " icon VARCHAR, visits INTEGER, lastVisit DATETIME);");
+    createQuery.prepare(query);
+    createQuery.exec();
+
+    // The first version of the database schema didn't have a 'domain' column
+    QSqlQuery tableInfoQuery(m_database);
+    query = QStringLiteral("PRAGMA TABLE_INFO(history);");
+    tableInfoQuery.prepare(query);
+    tableInfoQuery.exec();
+    while (tableInfoQuery.next()) {
+        if (tableInfoQuery.value(QStringLiteral("name")).toString() == QStringLiteral("domain")) {
+            break;
+        }
+    }
+    if (!tableInfoQuery.isValid()) {
+        QSqlQuery addDomainColumnQuery(m_database);
+        query = QStringLiteral("ALTER TABLE history ADD COLUMN domain VARCHAR;");
+        addDomainColumnQuery.prepare(query);
+        addDomainColumnQuery.exec();
+        // Updating all the entries in the database to add the domain is a
+        // costly operation that would slow down the application startup,
+        // do not do it here.
+    }
+
+    QSqlQuery createHiddenQuery(m_database);
+    query = QStringLiteral("CREATE TABLE IF NOT EXISTS history_hidden (url VARCHAR);");
+    createHiddenQuery.prepare(query);
+    createHiddenQuery.exec();
+}
+
+void DbWorker::doFetchEntries()
+{
+    QSqlQuery populateHiddenQuery(m_database);
+    QString query = QStringLiteral("SELECT url FROM history_hidden;");
+    populateHiddenQuery.prepare(query);
+    populateHiddenQuery.exec();
+    while (populateHiddenQuery.next()) {
+        Q_EMIT hiddenEntryFetched(populateHiddenQuery.value(0).toUrl());
+    }
+
+    QSqlQuery populateQuery(m_database);
+    query = QStringLiteral("SELECT url, domain, title, icon, visits, lastVisit "
+                           "FROM history ORDER BY lastVisit DESC;");
+    populateQuery.prepare(query);
+    populateQuery.exec();
+    while (populateQuery.next()) {
+        Q_EMIT entryFetched(populateQuery.value(0).toUrl(),
+                            populateQuery.value(1).toString(),
+                            populateQuery.value(2).toString(),
+                            populateQuery.value(3).toUrl(),
+                            populateQuery.value(4).toInt(),
+                            QDateTime::fromTime_t(populateQuery.value(5).toInt()));
+    }
+    Q_EMIT loaded();
+}
+
+void DbWorker::doEnqueue(DbWorker::Operation operation, QVariantList values)
+{
+    if (!m_flush) {
+        m_flush = new QTimer;
+        m_flush->setInterval(1000);
+        m_flush->setSingleShot(true);
+        connect(m_flush, SIGNAL(timeout()), SLOT(doFlush()));
+    }
+    QWriteLocker locker(&m_lock);
+    m_pending.enqueue(qMakePair(operation, values));
+    m_flush->start();
+}
+
+void DbWorker::doFlush()
+{
+    QWriteLocker locker(&m_lock);
+    while (!m_pending.isEmpty()) {
+        QPair<Operation, QVariantList> args = m_pending.dequeue();
+        QString statement;
+        switch (args.first) {
+        case InsertNewEntry:
+            statement = QStringLiteral("INSERT INTO history (url, domain, title, icon, "
+                                       "visits, lastVisit) VALUES (?, ?, ?, ?, 1, ?);");
+            break;
+        case InsertNewHiddenEntry:
+            statement = QStringLiteral("INSERT INTO history_hidden (url) VALUES (?);");
+            break;
+        case UpdateExistingEntry:
+            statement = QStringLiteral("UPDATE history SET domain=?, title=?, icon=?, "
+                                       "visits=?, lastVisit=? WHERE url=?;");
+            break;
+        case RemoveEntryByUrl:
+            statement = QStringLiteral("DELETE FROM history WHERE url=?;");
+            break;
+        case RemoveHiddenEntryByUrl:
+            statement = QStringLiteral("DELETE FROM history_hidden WHERE url=?;");
+            break;
+        case RemoveEntriesByDate:
+            statement = QStringLiteral("DELETE FROM history WHERE lastVisit BETWEEN ? AND ?;");
+            break;
+        case RemoveEntriesByDomain:
+            statement = QStringLiteral("DELETE FROM history WHERE domain=?;");
+            break;
+        case Clear:
+            statement = QStringLiteral("DELETE FROM %1;").arg(args.second.takeFirst().toString());
+            break;
+        default:
+            Q_UNREACHABLE();
+        }
+        if (statement.isEmpty()) {
+            return;
+        }
+        QSqlQuery query(m_database);
+        if (!query.prepare(statement)) {
+            continue;
+        }
+        Q_FOREACH(const QVariant& value, args.second) {
+            query.addBindValue(value);
+        }
+        query.exec();
+    }
+}
 
=== modified file 'src/app/webbrowser/history-model.h'
--- src/app/webbrowser/history-model.h	2016-02-26 12:26:20 +0000
+++ src/app/webbrowser/history-model.h	2016-10-13 14:41:36 +0000
@@ -23,11 +23,20 @@
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QDateTime>
 #include <QtCore/QList>
-#include <QtCore/QMutex>
+#include <QtCore/QPair>
+#include <QtCore/QQueue>
+#include <QtCore/QReadWriteLock>
+#include <QtCore/QSet>
 #include <QtCore/QString>
+#include <QtCore/QThread>
 #include <QtCore/QUrl>
+#include <QtCore/QVariant>
 #include <QtSql/QSqlDatabase>
 
+class QTimer;
+
+class DbWorker;
+
 class HistoryModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -74,6 +83,7 @@
 Q_SIGNALS:
     void databasePathChanged() const;
     void rowCountChanged();
+    void loaded() const;
 
 protected:
     struct HistoryEntry {
@@ -89,15 +99,16 @@
     int getEntryIndex(const QUrl& url) const;
     void updateExistingEntryInDatabase(const HistoryEntry& entry);
 
+private Q_SLOTS:
+    void onHiddenEntryFetched(const QUrl& url);
+    void onEntryFetched(const QUrl& url, const QString& domain, const QString& title,
+                        const QUrl& icon, int visits, const QDateTime& lastVisit);
+
 private:
-    QMutex m_dbMutex;
-    QSqlDatabase m_database;
-
-    QList<QUrl> m_hiddenEntries;
+    QString m_databasePath;
+    QSet<QUrl> m_hiddenEntries;
 
     void resetDatabase(const QString& databaseName);
-    void createOrAlterDatabaseSchema();
-    void populateFromDatabase();
     void removeByIndex(int index);
     void insertNewEntryInDatabase(const HistoryEntry& entry);
     void insertNewEntryInHiddenDatabase(const QUrl& url);
@@ -106,6 +117,52 @@
     void removeEntriesFromDatabaseByDate(const QDate& date);
     void removeEntriesFromDatabaseByDomain(const QString& domain);
     void clearDatabase();
+
+    QThread m_dbWorkerThread;
+    DbWorker* m_dbWorker;
+};
+
+class DbWorker : public QObject {
+    Q_OBJECT
+
+    Q_ENUMS(Operation)
+
+public:
+    DbWorker();
+    ~DbWorker();
+
+    enum Operation {
+        InsertNewEntry,
+        InsertNewHiddenEntry,
+        UpdateExistingEntry,
+        RemoveEntryByUrl,
+        RemoveHiddenEntryByUrl,
+        RemoveEntriesByDate,
+        RemoveEntriesByDomain,
+        Clear,
+    };
+
+Q_SIGNALS:
+    void resetDatabase(const QString& databaseName);
+    void fetchEntries();
+    void hiddenEntryFetched(const QUrl& url);
+    void entryFetched(const QUrl& url, const QString& domain, const QString& title,
+                      const QUrl& icon, int visits, const QDateTime& lastVisit);
+    void loaded();
+    void enqueue(Operation operation, QVariantList values);
+
+private Q_SLOTS:
+    void doResetDatabase(const QString& databaseName);
+    void doCreateOrAlterDatabaseSchema();
+    void doFetchEntries();
+    void doEnqueue(Operation operation, QVariantList values);
+    void doFlush();
+
+private:
+    QSqlDatabase m_database;
+    QReadWriteLock m_lock;
+    QQueue<QPair<Operation, QVariantList>> m_pending;
+    QTimer* m_flush;
 };
 
 #endif // __HISTORY_MODEL_H__
 
=== modified file 'src/app/webbrowser/webbrowser-app.qml'
--- src/app/webbrowser/webbrowser-app.qml	2016-09-20 19:55:22 +0000
+++ src/app/webbrowser/webbrowser-app.qml	2016-10-13 14:41:36 +0000
@@ -53,15 +53,6 @@
         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)
@@ -128,6 +119,20 @@
                         session.clear()
                     }
                 }
+                if (incognito && (allWindows.length > 1)) {
+                    // If the last incognito window is being closed,
+                    // prune incognito entries from the downloads model
+                    var incognitoWindows = 0
+                    for (var w in allWindows) {
+                        var window = allWindows[w]
+                        if ((window !== this) && window.incognito) {
+                            ++incognitoWindows
+                        }
+                    }
+                    if (incognitoWindows == 0) {
+                        DownloadsModel.pruneIncognitoDownloads()
+                    }
+                }
                 destroy()
             }
 
@@ -446,4 +451,18 @@
             }
         }
     }
+
+    property var historyModelMonitor: Connections {
+        target: HistoryModel
+        onLoaded: {
+            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)
+        }
+    }
 }
 
=== modified file 'src/app/webcontainer/Chrome.qml'
--- src/app/webcontainer/Chrome.qml	2016-05-26 17:07:44 +0000
+++ src/app/webcontainer/Chrome.qml	2016-10-13 14:41:36 +0000
@@ -23,6 +23,7 @@
 ChromeBase {
     id: chrome
 
+    property var webview: null
     property bool navigationButtonsVisible: false
     property bool accountSwitcher: false
 
 
=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2016-09-20 15:32:49 +0000
+++ src/app/webcontainer/WebApp.qml	2016-10-13 14:41:36 +0000
@@ -249,7 +249,8 @@
                 id: progressbarComponent
 
                 ThinProgressBar {
-                    webview: webapp.currentWebview
+                    visible: webapp.currentWebview && webapp.currentWebview.loading
+                    value: visible ? webapp.currentWebview.loadProgress : 0
 
                     anchors {
                         left: parent.left
 
=== modified file 'tests/autopilot/webapp_container/tests/__init__.py'
--- tests/autopilot/webapp_container/tests/__init__.py	2016-07-13 16:23:18 +0000
+++ tests/autopilot/webapp_container/tests/__init__.py	2016-10-13 14:41:36 +0000
@@ -52,7 +52,8 @@
             return LOCAL_BROWSER_CONTAINER_PATH_NAME
         return INSTALLED_BROWSER_CONTAINER_PATH_NAME
 
-    def launch_webcontainer_app(self, args, envvars={}, is_local_app=False):
+    def launch_webcontainer_app(self, args, envvars={}, is_local_app=False,
+                                ignore_focus=False):
         if model() != 'Desktop':
             args.append(
                 '--desktop_file_hint=/usr/share/applications/'
@@ -74,7 +75,7 @@
         except:
             self.app = None
 
-        if not is_local_app:
+        if not is_local_app and not ignore_focus:
             webview = self.get_oxide_webview()
             self.assertThat(
                 lambda: webview.activeFocus,
@@ -128,10 +129,12 @@
             'schemeUriHandleFilterResult(QString)')[-1][0]
         return result
 
-    def browse_to(self, url):
+    def browse_to(self, url, wait_for_load=True):
         webview = self.get_oxide_webview()
         webview.slots.navigateToUrl(url)
-        self.assert_page_eventually_loaded(url)
+
+        if wait_for_load:
+            self.assert_page_eventually_loaded(url)
 
     def kill_app(self, signal=signal.SIGKILL):
         os.kill(self.app.pid, signal)
@@ -161,9 +164,9 @@
         return self.base_url[len(self.BASE_URL_SCHEME):]
 
     def launch_webcontainer_app_with_local_http_server(
-            self, args, path='/', envvars={}, homepage=''):
+            self, args, path='/', envvars={}, homepage='', ignore_focus=False):
         self.url = self.base_url + path
         if len(homepage) != 0:
             self.url = homepage
         args.append(self.url)
-        self.launch_webcontainer_app(args, envvars)
+        self.launch_webcontainer_app(args, envvars, ignore_focus=ignore_focus)
 
=== modified file 'tests/autopilot/webapp_container/tests/fake_servers.py'
--- tests/autopilot/webapp_container/tests/fake_servers.py	2016-05-26 17:07:44 +0000
+++ tests/autopilot/webapp_container/tests/fake_servers.py	2016-10-13 14:41:36 +0000
@@ -391,6 +391,40 @@
                 color_url = qs['color_url_part'][0]
             self.serve_content(
                 self.local_browse_link_chain_content(next, color_url))
+        elif self.path == "/js-alert-dialog":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.onload = function() {'
+            html += '  window.alert("Alert Dialog")'
+            html += '} </script></body></html>'
+            self.serve_content(html)
+        elif self.path == "/js-before-unload-dialog":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.onbeforeunload = function(e) {'
+            html += '  var dialogText = "Dialog text here";'
+            html += '  e.returnValue = dialogText;'
+            html += '  return dialogText;'
+            html += '}; </script></body></html>'
+            self.serve_content(html)
+        elif self.path == "/js-confirm-dialog":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.onload = function() {'
+            html += '  if (window.confirm("Confirm Dialog") == true) {'
+            html += '    document.title = "OK" } '
+            html += '  else { document.title = "CANCEL" }'
+            html += '} </script></body></html>'
+            self.serve_content(html)
+        elif self.path == "/js-prompt-dialog":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.onload = function() {'
+            html += '  var result = window.prompt("Prompt Dialog", "Default");'
+            html += '  if (result != null) { document.title = result; } '
+            html += '  else { document.title = "CANCEL" }'
+            html += '} </script></body></html>'
+            self.serve_content(html)
         else:
             self.send_error(404)
 
 
=== added file 'tests/autopilot/webapp_container/tests/test_js_dialogs.py'
--- tests/autopilot/webapp_container/tests/test_js_dialogs.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webapp_container/tests/test_js_dialogs.py	2016-10-13 14:41:36 +0000
@@ -0,0 +1,214 @@
+# -*- 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 webapp_container.tests import WebappContainerTestCaseWithLocalContentBase
+
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
+
+class DialogWrapper(object):
+    def __init__(self, dialog):
+        self.dialog = dialog
+
+        self.text = self.dialog.text
+        self.wait_until_destroyed = self.dialog.wait_until_destroyed
+        self.visible = self.dialog.visible
+
+
+class AlertDialog(DialogWrapper):
+    def get_ok_button(self):
+        return self.dialog.select_single("Button", objectName="okButton")
+
+
+class BeforeUnloadDialog(DialogWrapper):
+    def get_leave_button(self):
+        return self.dialog.select_single("Button", objectName="leaveButton")
+
+    def get_stay_button(self):
+        return self.dialog.select_single("Button", objectName="stayButton")
+
+
+class ConfirmDialog(DialogWrapper):
+    def get_cancel_button(self):
+        return self.dialog.select_single("Button", objectName="cancelButton")
+
+    def get_ok_button(self):
+        return self.dialog.select_single("Button", objectName="okButton")
+
+
+class PromptDialog(DialogWrapper):
+    def get_cancel_button(self):
+        return self.dialog.select_single("Button", objectName="cancelButton")
+
+    def get_input_textfield(self):
+        return self.dialog.select_single("TextField",
+                                         objectName="inputTextField")
+
+    def get_ok_button(self):
+        return self.dialog.select_single("Button", objectName="okButton")
+
+
+class TestJSDialogs(WebappContainerTestCaseWithLocalContentBase):
+
+    def test_alert(self):
+        self.launch_webcontainer_app_with_local_http_server(
+            [], '/js-alert-dialog', ignore_focus=True)
+
+        dialog = AlertDialog(
+            self.app.wait_select_single("Dialog", objectName="alertDialog")
+        )
+        dialog.visible.wait_for(True)
+
+        # Check alert text is correct
+        self.assertThat(dialog.text, Equals("Alert Dialog"))
+
+        # Click OK, check dialog is destroyed
+        self.pointing_device.click_object(dialog.get_ok_button())
+        dialog.wait_until_destroyed()
+
+    def test_before_unload_leave(self):
+        testUrl = self.base_url + "/"
+
+        self.launch_webcontainer_app_with_local_http_server(
+            [], '/js-before-unload-dialog', ignore_focus=True)
+
+        # Change the url to trigger window.onBeforeUnload
+        self.browse_to(testUrl, wait_for_load=False)
+
+        dialog = BeforeUnloadDialog(
+            self.app.wait_select_single("Dialog",
+                                        objectName="beforeUnloadDialog")
+        )
+        dialog.visible.wait_for(True)
+
+        # Click leave and check that url changes
+        self.pointing_device.click_object(dialog.get_leave_button())
+
+        self.assertThat(self.get_oxide_webview().url,
+                        Eventually(Equals(testUrl)))
+
+    def test_before_unload_stay(self):
+        page = '/js-before-unload-dialog'
+        beforeUnloadUrl = self.base_url + page
+        testUrl = self.base_url + "/"
+
+        self.launch_webcontainer_app_with_local_http_server(
+            [], page, ignore_focus=True)
+
+        # Change the url to trigger window.onBeforeUnload
+        self.browse_to(testUrl, wait_for_load=False)
+
+        dialog = BeforeUnloadDialog(
+            self.app.wait_select_single("Dialog",
+                                        objectName="beforeUnloadDialog")
+        )
+        dialog.visible.wait_for(True)
+
+        # Click stay and check url does not change
+        self.pointing_device.click_object(dialog.get_stay_button())
+
+        self.assertThat(self.get_oxide_webview().url,
+                        Eventually(Equals(beforeUnloadUrl)))
+
+    def test_confirm_cancel(self):
+        self.launch_webcontainer_app_with_local_http_server(
+            [], '/js-confirm-dialog', ignore_focus=True)
+
+        dialog = ConfirmDialog(
+            self.app.wait_select_single("Dialog", objectName="confirmDialog")
+        )
+        dialog.visible.wait_for(True)
+
+        # Check that confirm text is correct
+        self.assertThat(dialog.text, Equals("Confirm Dialog"))
+
+        # Click cancel and check that dialog is destroyed
+        self.pointing_device.click_object(dialog.get_cancel_button())
+        dialog.wait_until_destroyed()
+
+        # Check that title changes to cancel
+        self.assertThat(self.get_webcontainer_webview().title,
+                        Eventually(Equals("CANCEL")))
+
+    def test_confirm_ok(self):
+        self.launch_webcontainer_app_with_local_http_server(
+            [], '/js-confirm-dialog', ignore_focus=True)
+
+        dialog = ConfirmDialog(
+            self.app.wait_select_single("Dialog", objectName="confirmDialog")
+        )
+        dialog.visible.wait_for(True)
+
+        # Check that confirm text is correct
+        self.assertThat(dialog.text, Equals("Confirm Dialog"))
+
+        # Click OK and check that dialog is destroyed
+        self.pointing_device.click_object(dialog.get_ok_button())
+        dialog.wait_until_destroyed()
+
+        # Check that title changes to OK
+        self.assertThat(self.get_webcontainer_webview().title,
+                        Eventually(Equals("OK")))
+
+    def test_prompt_cancel(self):
+        self.launch_webcontainer_app_with_local_http_server(
+            [], '/js-prompt-dialog', ignore_focus=True)
+
+        dialog = PromptDialog(
+            self.app.wait_select_single("Dialog", objectName="promptDialog")
+        )
+        dialog.visible.wait_for(True)
+
+        # Check that prompt text is correct and default textfield
+        self.assertThat(dialog.text, Equals("Prompt Dialog"))
+        self.assertThat(dialog.get_input_textfield().text,
+                        Equals("Default"))
+
+        # Click cancel and check that dialog is destroyed
+        self.pointing_device.click_object(dialog.get_cancel_button())
+        dialog.wait_until_destroyed()
+
+        # Check that title changes to cancel
+        self.assertThat(self.get_webcontainer_webview().title,
+                        Eventually(Equals("CANCEL")))
+
+    def test_prompt_ok(self):
+        self.launch_webcontainer_app_with_local_http_server(
+            [], '/js-prompt-dialog', ignore_focus=True)
+
+        dialog = PromptDialog(
+            self.app.wait_select_single("Dialog", objectName="promptDialog")
+        )
+        dialog.visible.wait_for(True)
+
+        # Check that prompt text is correct and default textfield
+        self.assertThat(dialog.text, Equals("Prompt Dialog"))
+        self.assertThat(dialog.get_input_textfield().text,
+                        Equals("Default"))
+
+        # Enter text into textfield
+        text = "TEST"
+        entry = dialog.get_input_textfield()
+        entry.write(text)
+
+        # Click ok and check that dialog is destroyed
+        self.pointing_device.click_object(dialog.get_ok_button())
+        dialog.wait_until_destroyed()
+
+        # Check that title changes to text entered in textfield
+        self.assertThat(self.get_webcontainer_webview().title,
+                        Eventually(Equals(text)))
 
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2016-08-10 15:43:04 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2016-10-13 14:41:36 +0000
@@ -179,9 +179,9 @@
     def get_history_view(self):
         try:
             if self.wide:
-                return self.select_single(HistoryViewWide)
+                return self.wait_select_single(HistoryViewWide)
             else:
-                return self.select_single(HistoryView)
+                return self.wait_select_single(HistoryView)
         except exceptions.StateNotFoundError:
             return None
 
@@ -238,6 +238,26 @@
             menu.click_cancel_action()
         menu.wait_until_destroyed()
 
+    def get_alert_dialog(self):
+        return AlertDialog(
+            self.wait_select_single("Dialog", objectName="alertDialog")
+        )
+
+    def get_before_unload_dialog(self):
+        return BeforeUnloadDialog(
+            self.wait_select_single("Dialog", objectName="beforeUnloadDialog")
+        )
+
+    def get_confirm_dialog(self):
+        return ConfirmDialog(
+            self.wait_select_single("Dialog", objectName="confirmDialog")
+        )
+
+    def get_prompt_dialog(self):
+        return PromptDialog(
+            self.wait_select_single("Dialog", objectName="promptDialog")
+        )
+
 
 class Chrome(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
@@ -724,3 +744,45 @@
     def click_cancel_action(self):
         action = self.select_single("Empty", objectName="cancelAction")
         self.pointing_device.click_object(action)
+
+
+class DialogWrapper(object):
+    def __init__(self, dialog):
+        self.dialog = dialog
+
+        self.text = self.dialog.text
+        self.wait_until_destroyed = self.dialog.wait_until_destroyed
+        self.visible = self.dialog.visible
+
+
+class AlertDialog(DialogWrapper):
+    def get_ok_button(self):
+        return self.dialog.select_single("Button", objectName="okButton")
+
+
+class BeforeUnloadDialog(DialogWrapper):
+    def get_leave_button(self):
+        return self.dialog.select_single("Button", objectName="leaveButton")
+
+    def get_stay_button(self):
+        return self.dialog.select_single("Button", objectName="stayButton")
+
+
+class ConfirmDialog(DialogWrapper):
+    def get_cancel_button(self):
+        return self.dialog.select_single("Button", objectName="cancelButton")
+
+    def get_ok_button(self):
+        return self.dialog.select_single("Button", objectName="okButton")
+
+
+class PromptDialog(DialogWrapper):
+    def get_cancel_button(self):
+        return self.dialog.select_single("Button", objectName="cancelButton")
+
+    def get_input_textfield(self):
+        return self.dialog.select_single("TextField",
+                                         objectName="inputTextField")
+
+    def get_ok_button(self):
+        return self.dialog.select_single("Button", objectName="okButton")
 
=== modified file 'tests/autopilot/webbrowser_app/tests/http_server.py'
--- tests/autopilot/webbrowser_app/tests/http_server.py	2016-03-07 18:29:23 +0000
+++ tests/autopilot/webbrowser_app/tests/http_server.py	2016-10-13 14:41:36 +0000
@@ -252,6 +252,54 @@
             html += '50%; transform: translate(-50%, -50%); font-size: 500%">'
             html += 'Supercalifragilisticexpialidocious</div></body></html>'
             self.send_html(html)
+        elif self.path == "/redirect-no-title-header":
+            self.send_response(301)
+            self.send_header("Location", "/redirect-destination")
+            self.end_headers()
+        elif self.path == "/redirect-no-title-js":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.location.href = "/redirect-destination"'
+            html += '</script></body></html>'
+            self.send_html(html)
+        elif self.path == "/redirect-destination":
+            self.send_response(200)
+            html = '<html><body><p>redirect-destination</p></body></html>'
+            self.send_html(html)
+        elif self.path == "/js-alert-dialog":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.onload = function() {'
+            html += '  window.alert("Alert Dialog")'
+            html += '} </script></body></html>'
+            self.send_html(html)
+        elif self.path == "/js-before-unload-dialog":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.onbeforeunload = function(e) {'
+            html += '  var dialogText = "Dialog text here";'
+            html += '  e.returnValue = dialogText;'
+            html += '  return dialogText;'
+            html += '}; </script></body></html>'
+            self.send_html(html)
+        elif self.path == "/js-confirm-dialog":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.onload = function() {'
+            html += '  if (window.confirm("Confirm Dialog") == true) {'
+            html += '    document.title = "OK" } '
+            html += '  else { document.title = "CANCEL" }'
+            html += '} </script></body></html>'
+            self.send_html(html)
+        elif self.path == "/js-prompt-dialog":
+            self.send_response(200)
+            html = '<html><body><script type="text/javascript">'
+            html += 'window.onload = function() {'
+            html += '  var result = window.prompt("Prompt Dialog", "Default");'
+            html += '  if (result != null) { document.title = result; } '
+            html += '  else { document.title = "CANCEL" }'
+            html += '} </script></body></html>'
+            self.send_html(html)
         else:
             self.send_error(404)
 
 
=== modified file 'tests/autopilot/webbrowser_app/tests/test_history.py'
--- tests/autopilot/webbrowser_app/tests/test_history.py	2016-02-29 20:42:13 +0000
+++ tests/autopilot/webbrowser_app/tests/test_history.py	2016-10-13 14:41:36 +0000
@@ -124,3 +124,38 @@
         self.main_window.wait_until_page_loaded(pushed)
         self.open_history()
         self.expect_history_entries([pushed, url, self.url])
+
+    def test_title_correct_redirect_header(self):
+        # Regression test for https://launchpad.net/bugs/1603835
+        url_redirect = self.base_url + "/redirect-no-title-header"
+        url_destination = self.base_url + "/redirect-destination"
+        url_test = self.base_url + "/test1"
+
+        self.main_window.go_to_url(url_redirect)
+        self.main_window.wait_until_page_loaded(url_destination)
+
+        self.open_history()
+
+        entries = self.expect_history_entries(
+            [url_destination, url_test]
+        )
+        self.assertThat(entries[0].title, Equals("test/redirect-destination"))
+        self.assertThat(entries[1].title, Equals("test page 1"))
+
+    def test_title_correct_redirect_js(self):
+        # Regression test for https://launchpad.net/bugs/1603835
+        url_redirect = self.base_url + "/redirect-no-title-js"
+        url_destination = self.base_url + "/redirect-destination"
+        url_test = self.base_url + "/test1"
+
+        self.main_window.go_to_url(url_redirect)
+        self.main_window.wait_until_page_loaded(url_destination)
+
+        self.open_history()
+
+        entries = self.expect_history_entries(
+            [url_destination, url_redirect, url_test]
+        )
+        self.assertThat(entries[0].title, Equals("test/redirect-destination"))
+        self.assertThat(entries[1].title, Equals("test/redirect-no-title-js"))
+        self.assertThat(entries[2].title, Equals("test page 1"))
 
=== added file 'tests/autopilot/webbrowser_app/tests/test_js_dialogs.py'
--- tests/autopilot/webbrowser_app/tests/test_js_dialogs.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webbrowser_app/tests/test_js_dialogs.py	2016-10-13 14:41:36 +0000
@@ -0,0 +1,156 @@
+# -*- 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 autopilot.matchers import Eventually
+
+from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
+
+
+class TestJSDialogs(StartOpenRemotePageTestCaseBase):
+
+    def test_alert(self):
+        url = self.base_url + "/js-alert-dialog"
+        self.main_window.go_to_url(url)
+
+        dialog = self.main_window.get_alert_dialog()
+        dialog.visible.wait_for(True)
+
+        # Check alert text is correct
+        self.assertThat(dialog.text, Equals("Alert Dialog"))
+
+        # Click OK, check dialog is destroyed
+        self.pointing_device.click_object(dialog.get_ok_button())
+        dialog.wait_until_destroyed()
+
+    def test_before_unload_leave(self):
+        beforeUnloadUrl = self.base_url + "/js-before-unload-dialog"
+        testUrl = self.base_url + "/test1"
+
+        self.main_window.go_to_url(beforeUnloadUrl)
+        self.main_window.wait_until_page_loaded(beforeUnloadUrl)
+
+        # Change the url to trigger window.onBeforeUnload
+        self.main_window.go_to_url(testUrl)
+
+        dialog = self.main_window.get_before_unload_dialog()
+        dialog.visible.wait_for(True)
+
+        # Click leave and check that url changes
+        self.pointing_device.click_object(dialog.get_leave_button())
+
+        self.assertThat(self.main_window.get_current_webview().url,
+                        Eventually(Equals(testUrl)))
+
+    def test_before_unload_stay(self):
+        beforeUnloadUrl = self.base_url + "/js-before-unload-dialog"
+        testUrl = self.base_url + "/test1"
+
+        self.main_window.go_to_url(beforeUnloadUrl)
+        self.main_window.wait_until_page_loaded(beforeUnloadUrl)
+
+        # Change the url to trigger window.onBeforeUnload
+        self.main_window.go_to_url(testUrl)
+
+        dialog = self.main_window.get_before_unload_dialog()
+        dialog.visible.wait_for(True)
+
+        # Click stay and check url does not change
+        self.pointing_device.click_object(dialog.get_stay_button())
+
+        self.assertThat(self.main_window.get_current_webview().url,
+                        Eventually(Equals(beforeUnloadUrl)))
+
+    def test_confirm_cancel(self):
+        url = self.base_url + "/js-confirm-dialog"
+        self.main_window.go_to_url(url)
+
+        dialog = self.main_window.get_confirm_dialog()
+        dialog.visible.wait_for(True)
+
+        # Check that confirm text is correct
+        self.assertThat(dialog.text, Equals("Confirm Dialog"))
+
+        # Click cancel and check that dialog is destroyed
+        self.pointing_device.click_object(dialog.get_cancel_button())
+        dialog.wait_until_destroyed()
+
+        # Check that title changes to cancel
+        self.assertThat(self.main_window.get_current_webview().title,
+                        Eventually(Equals("CANCEL")))
+
+    def test_confirm_ok(self):
+        url = self.base_url + "/js-confirm-dialog"
+        self.main_window.go_to_url(url)
+
+        dialog = self.main_window.get_confirm_dialog()
+        dialog.visible.wait_for(True)
+
+        # Check that confirm text is correct
+        self.assertThat(dialog.text, Equals("Confirm Dialog"))
+
+        # Click OK and check that dialog is destroyed
+        self.pointing_device.click_object(dialog.get_ok_button())
+        dialog.wait_until_destroyed()
+
+        # Check that title changes to OK
+        self.assertThat(self.main_window.get_current_webview().title,
+                        Eventually(Equals("OK")))
+
+    def test_prompt_cancel(self):
+        url = self.base_url + "/js-prompt-dialog"
+        self.main_window.go_to_url(url)
+
+        dialog = self.main_window.get_prompt_dialog()
+        dialog.visible.wait_for(True)
+
+        # Check that prompt text is correct and default textfield
+        self.assertThat(dialog.text, Equals("Prompt Dialog"))
+        self.assertThat(dialog.get_input_textfield().text,
+                        Equals("Default"))
+
+        # Click cancel and check that dialog is destroyed
+        self.pointing_device.click_object(dialog.get_cancel_button())
+        dialog.wait_until_destroyed()
+
+        # Check that title changes to cancel
+        self.assertThat(self.main_window.get_current_webview().title,
+                        Eventually(Equals("CANCEL")))
+
+    def test_prompt_ok(self):
+        url = self.base_url + "/js-prompt-dialog"
+        self.main_window.go_to_url(url)
+
+        dialog = self.main_window.get_prompt_dialog()
+        dialog.visible.wait_for(True)
+
+        # Check that prompt text is correct and default textfield
+        self.assertThat(dialog.text, Equals("Prompt Dialog"))
+        self.assertThat(dialog.get_input_textfield().text,
+                        Equals("Default"))
+
+        # Enter text into textfield
+        text = "TEST"
+        entry = dialog.get_input_textfield()
+        entry.write(text)
+
+        # Click ok and check that dialog is destroyed
+        self.pointing_device.click_object(dialog.get_ok_button())
+        dialog.wait_until_destroyed()
+
+        # Check that title changes to text entered in textfield
+        self.assertThat(self.main_window.get_current_webview().title,
+                        Eventually(Equals(text)))
 
=== modified file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py'
--- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2016-08-10 15:43:04 +0000
+++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2016-10-13 14:41:36 +0000
@@ -440,14 +440,7 @@
         folder = folders[0]
         folder_cx = folder.globalRect.x + folder.width / 2
         folder_cy = folder.globalRect.y + folder.height / 2
-        # Work around https://launchpad.net/bugs/1499437 by dragging downwards
-        # a little bit first, then to the target folder.
-        self.pointing_device.move_to_object(grip)
-        pos = self.pointing_device.position()
-        self.pointing_device.press()
-        self.pointing_device.move(pos[0], pos[1] + 20)
-        self.pointing_device.move(folder_cx, folder_cy)
-        self.pointing_device.release()
+        self.pointing_device.drag(rect.x, rect.y, folder_cx, folder_cy)
         self.assertThat(grip.globalRect, Eventually(Equals(rect)))
 
         # Test that dragging an item to another folder removes it from this one
 
=== modified file 'tests/unittests/downloads-model/tst_DownloadsModelTests.cpp'
--- tests/unittests/downloads-model/tst_DownloadsModelTests.cpp	2016-01-12 10:37:15 +0000
+++ tests/unittests/downloads-model/tst_DownloadsModelTests.cpp	2016-10-13 14:41:36 +0000
@@ -17,6 +17,8 @@
  */
 
 #include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QTemporaryDir>
 #include <QtCore/QTemporaryFile>
 #include <QtTest/QSignalSpy>
 #include <QtTest/QtTest>
@@ -27,11 +29,16 @@
     Q_OBJECT
 
 private:
+    QTemporaryDir homeDir;
     DownloadsModel* model;
 
 private Q_SLOTS:
     void init()
     {
+        // QStandardPaths::setTestModeEnabled() doesn't affect
+        // QStandardPaths::DownloadLocation, so we must override $HOME to
+        // ensure the test won't write data to the user's home directory.
+        qputenv("HOME", homeDir.path().toUtf8());
         model = new DownloadsModel;
         model->setDatabasePath(":memory:");
     }
@@ -39,6 +46,7 @@
     void cleanup()
     {
         delete model;
+        qunsetenv("HOME");
     }
 
     void shouldBeInitiallyEmpty()
@@ -58,90 +66,177 @@
         QVERIFY(roleNames.contains("paused"));
         QVERIFY(roleNames.contains("error"));
         QVERIFY(roleNames.contains("created"));
+        QVERIFY(roleNames.contains("incognito"));
     }
 
     void shouldContainAddedEntries()
     {
         QVERIFY(!model->contains(QStringLiteral("testid")));
-        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/html"));
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/html"), false);
         QVERIFY(model->contains(QStringLiteral("testid")));
     }
 
     void shouldAddNewEntries()
     {
-        QSignalSpy spy(model, SIGNAL(added(QString, QUrl, QString)));
+        QSignalSpy spy(model, SIGNAL(rowsInserted(const QModelIndex&, int, int)));
 
-        model->add("testid", QUrl("http://example.org/"), "text/plain");
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
         QCOMPARE(model->rowCount(), 1);
         QCOMPARE(spy.count(), 1);
         QVariantList args = spy.takeFirst();
-        QCOMPARE(args.at(0).toString(), QString("testid"));
-        QCOMPARE(args.at(1).toUrl(), QUrl("http://example.org/"));
-        QCOMPARE(args.at(2).toString(), QString("text/plain"));
+        QCOMPARE(args.at(0).toInt(), 0);
+        QCOMPARE(args.at(1).toInt(), 0);
+        QCOMPARE(model->data(model->index(0), DownloadsModel::DownloadId).toString(), QStringLiteral("testid"));
+        QCOMPARE(model->data(model->index(0), DownloadsModel::Url).toUrl(), QUrl(QStringLiteral("http://example.org/")));
+        QCOMPARE(model->data(model->index(0), DownloadsModel::Mimetype).toString(), QStringLiteral("text/plain"));
 
-        model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf");
+        model->add(QStringLiteral("testid2"), QUrl(QStringLiteral("http://example.org/pdf")), QStringLiteral("application/pdf"), false);
         QCOMPARE(model->rowCount(), 2);
         QCOMPARE(spy.count(), 1);
         args = spy.takeFirst();
-        QCOMPARE(args.at(0).toString(), QString("testid2"));
-        QCOMPARE(args.at(1).toUrl(), QUrl("http://example.org/pdf"));
-        QCOMPARE(args.at(2).toString(), QString("application/pdf"));
+        QCOMPARE(args.at(0).toInt(), 0);
+        QCOMPARE(args.at(1).toInt(), 0);
+        QCOMPARE(model->data(model->index(0), DownloadsModel::DownloadId).toString(), QStringLiteral("testid2"));
+        QCOMPARE(model->data(model->index(0), DownloadsModel::Url).toUrl(), QUrl(QStringLiteral("http://example.org/pdf")));
+        QCOMPARE(model->data(model->index(0), DownloadsModel::Mimetype).toString(), QStringLiteral("application/pdf"));
     }
 
     void shouldRemoveCancelled()
     {
-        model->add("testid", QUrl("http://example.org/"), "text/plain");
-        model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf");
-        model->add("testid3", QUrl("https://example.org/secure.png"), "image/png");
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
+        model->add(QStringLiteral("testid2"), QUrl(QStringLiteral("http://example.org/pdf")), QStringLiteral("application/pdf"), false);
+        model->add(QStringLiteral("testid3"), QUrl(QStringLiteral("https://example.org/secure.png")), QStringLiteral("image/png"), false);
         QCOMPARE(model->rowCount(), 3);
 
-        model->cancelDownload("testid2");
+        model->cancelDownload(QStringLiteral("testid2"));
         QCOMPARE(model->rowCount(), 2);
 
-        model->cancelDownload("invalid");
+        model->cancelDownload(QStringLiteral("invalid"));
         QCOMPARE(model->rowCount(), 2);
     }
 
     void shouldCompleteDownloads()
     {
-        QSignalSpy spy(model, SIGNAL(completeChanged(QString, bool)));
-
-        model->add("testid", QUrl("http://example.org/"), "text/plain");
-        QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Complete).toBool());
-        model->setComplete("testid", true);
-        QCOMPARE(spy.count(), 1);
-        QVariantList args = spy.takeFirst();
-        QCOMPARE(args.at(0).toString(), QString("testid"));
-        QCOMPARE(args.at(1).toBool(), true);
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
+        QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Complete).toBool());
+        QSignalSpy spy(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+
+        model->setComplete(QStringLiteral("testid"), true);
+        QVERIFY(model->data(model->index(0, 0), DownloadsModel::Complete).toBool());
+        QCOMPARE(spy.count(), 1);
+        QVariantList args = spy.takeFirst();
+        QCOMPARE(args.at(0).toModelIndex().row(), 0);
+        QCOMPARE(args.at(1).toModelIndex().row(), 0);
+        QVector<int> roles = args.at(2).value<QVector<int> >();
+        QCOMPARE(roles.size(), 1);
+        QCOMPARE(roles.at(0), (int) DownloadsModel::Complete);
+
+        model->setComplete(QStringLiteral("testid"), true);
+        QVERIFY(model->data(model->index(0, 0), DownloadsModel::Complete).toBool());
+        QVERIFY(spy.isEmpty());
+
+        model->setComplete(QStringLiteral("testid"), false);
+        QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Complete).toBool());
+        QCOMPARE(spy.count(), 1);
+        args = spy.takeFirst();
+        QCOMPARE(args.at(0).toModelIndex().row(), 0);
+        QCOMPARE(args.at(1).toModelIndex().row(), 0);
+        roles = args.at(2).value<QVector<int> >();
+        QCOMPARE(roles.size(), 1);
+        QCOMPARE(roles.at(0), (int) DownloadsModel::Complete);
+    }
+
+    void shouldSetError()
+    {
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
+        QVERIFY(model->data(model->index(0, 0), DownloadsModel::Error).toString().isEmpty());
+        QSignalSpy spy(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+
+        model->setError(QStringLiteral("testid"), QStringLiteral("foo"));
+        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Error).toString(), QStringLiteral("foo"));
+        QCOMPARE(spy.count(), 1);
+        QVariantList args = spy.takeFirst();
+        QCOMPARE(args.at(0).toModelIndex().row(), 0);
+        QCOMPARE(args.at(1).toModelIndex().row(), 0);
+        QVector<int> roles = args.at(2).value<QVector<int> >();
+        QCOMPARE(roles.size(), 1);
+        QCOMPARE(roles.at(0), (int) DownloadsModel::Error);
+
+        model->setError(QStringLiteral("testid"), QStringLiteral("foo"));
+        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Error).toString(), QStringLiteral("foo"));
+        QVERIFY(spy.isEmpty());
+
+        model->setError(QStringLiteral("testid"), QString("bar"));
+        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Error).toString(), QStringLiteral("bar"));
+        QCOMPARE(spy.count(), 1);
+        args = spy.takeFirst();
+        QCOMPARE(args.at(0).toModelIndex().row(), 0);
+        QCOMPARE(args.at(1).toModelIndex().row(), 0);
+        roles = args.at(2).value<QVector<int> >();
+        QCOMPARE(roles.size(), 1);
+        QCOMPARE(roles.at(0), (int) DownloadsModel::Error);
+    }
+
+    void shouldPauseAndResumeDownload()
+    {
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
+        QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Paused).toBool());
+        QSignalSpy spy(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+
+        model->pauseDownload(QStringLiteral("testid"));
+        QVERIFY(model->data(model->index(0, 0), DownloadsModel::Paused).toBool());
+        QCOMPARE(spy.count(), 1);
+        QVariantList args = spy.takeFirst();
+        QCOMPARE(args.at(0).toModelIndex().row(), 0);
+        QCOMPARE(args.at(1).toModelIndex().row(), 0);
+        QVector<int> roles = args.at(2).value<QVector<int> >();
+        QCOMPARE(roles.size(), 1);
+        QCOMPARE(roles.at(0), (int) DownloadsModel::Paused);
+
+        model->pauseDownload(QStringLiteral("testid"));
+        QVERIFY(model->data(model->index(0, 0), DownloadsModel::Paused).toBool());
+        QVERIFY(spy.isEmpty());
+
+        model->resumeDownload(QStringLiteral("testid"));
+        QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Paused).toBool());
+        QCOMPARE(spy.count(), 1);
+        args = spy.takeFirst();
+        QCOMPARE(args.at(0).toModelIndex().row(), 0);
+        QCOMPARE(args.at(1).toModelIndex().row(), 0);
+        roles = args.at(2).value<QVector<int> >();
+        QCOMPARE(roles.size(), 1);
+        QCOMPARE(roles.at(0), (int) DownloadsModel::Paused);
     }
 
     void shouldKeepEntriesSortedChronologically()
     {
-        model->add("testid", QUrl("http://example.org/"), "text/plain");
-        model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf");
-        model->add("testid3", QUrl("https://example.org/secure.png"), "image/png");
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
+        model->add(QStringLiteral("testid2"), QUrl(QStringLiteral("http://example.org/pdf")), QStringLiteral("application/pdf"), false);
+        model->add(QStringLiteral("testid3"), QUrl(QStringLiteral("https://example.org/secure.png")), QStringLiteral("image/png"), false);
 
-        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::DownloadId).toString(), QString("testid3"));
-        QCOMPARE(model->data(model->index(1, 0), DownloadsModel::DownloadId).toString(), QString("testid2"));
-        QCOMPARE(model->data(model->index(2, 0), DownloadsModel::DownloadId).toString(), QString("testid"));
+        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::DownloadId).toString(), QStringLiteral("testid3"));
+        QCOMPARE(model->data(model->index(1, 0), DownloadsModel::DownloadId).toString(), QStringLiteral("testid2"));
+        QCOMPARE(model->data(model->index(2, 0), DownloadsModel::DownloadId).toString(), QStringLiteral("testid"));
     }
 
     void shouldReturnData()
     {
-        model->add("testid", QUrl("http://example.org/"), "text/plain");
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
         QVERIFY(!model->data(QModelIndex(), DownloadsModel::DownloadId).isValid());
         QVERIFY(!model->data(model->index(-1, 0), DownloadsModel::DownloadId).isValid());
         QVERIFY(!model->data(model->index(3, 0), DownloadsModel::DownloadId).isValid());
-        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::DownloadId).toString(), QString("testid"));
-        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Url).toUrl(), QUrl("http://example.org/"));
-        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Mimetype).toString(), QString("text/plain"));
+        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::DownloadId).toString(), QStringLiteral("testid"));
+        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Url).toUrl(), QUrl(QStringLiteral("http://example.org/")));
+        QCOMPARE(model->data(model->index(0, 0), DownloadsModel::Mimetype).toString(), QStringLiteral("text/plain"));
         QVERIFY(model->data(model->index(0, 0), DownloadsModel::Created).toDateTime() <= QDateTime::currentDateTime());
         QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Complete).toBool());
+        QVERIFY(!model->data(model->index(0, 0), DownloadsModel::Incognito).toBool());
+        QVERIFY(!model->data(model->index(0, 0), -1).isValid());
     }
 
     void shouldReturnDatabasePath()
     {
-        QCOMPARE(model->databasePath(), QString(":memory:"));
+        QCOMPARE(model->databasePath(), QStringLiteral(":memory:"));
     }
 
     void shouldNotifyWhenSettingDatabasePath()
@@ -149,14 +244,14 @@
         QSignalSpy spyPath(model, SIGNAL(databasePathChanged()));
         QSignalSpy spyReset(model, SIGNAL(modelReset()));
 
-        model->setDatabasePath(":memory:");
+        model->setDatabasePath(QStringLiteral(":memory:"));
         QVERIFY(spyPath.isEmpty());
         QVERIFY(spyReset.isEmpty());
 
-        model->setDatabasePath("");
+        model->setDatabasePath(QStringLiteral(""));
         QCOMPARE(spyPath.count(), 1);
         QCOMPARE(spyReset.count(), 1);
-        QCOMPARE(model->databasePath(), QString(":memory:"));
+        QCOMPARE(model->databasePath(), QStringLiteral(":memory:"));
     }
 
     void shouldSerializeOnDisk()
@@ -167,8 +262,10 @@
         delete model;
         model = new DownloadsModel;
         model->setDatabasePath(fileName);
-        model->add("testid", QUrl("http://example.org/"), "text/plain");
-        model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf");
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
+        model->add(QStringLiteral("testid2"), QUrl(QStringLiteral("http://example.org/pdf")), QStringLiteral("application/pdf"), false);
+        model->add(QStringLiteral("testid3"), QUrl(QStringLiteral("http://example.org/incognito.pdf")), QStringLiteral("application/pdf"), true);
+        QCOMPARE(model->rowCount(), 3);
         delete model;
         model = new DownloadsModel;
         model->setDatabasePath(fileName);
@@ -180,17 +277,139 @@
     {
         QCOMPARE(model->property("count").toInt(), 0);
         QCOMPARE(model->rowCount(), 0);
-        model->add("testid", QUrl("http://example.org/"), "text/plain");
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
         QCOMPARE(model->property("count").toInt(), 1);
         QCOMPARE(model->rowCount(), 1);
-        model->add("testid2", QUrl("http://example.org/pdf"), "application/pdf");
+        model->add(QStringLiteral("testid2"), QUrl(QStringLiteral("http://example.org/pdf")), QStringLiteral("application/pdf"), false);
         QCOMPARE(model->property("count").toInt(), 2);
         QCOMPARE(model->rowCount(), 2);
-        model->add("testid3", QUrl("https://example.org/secure.png"), "image/png");
+        model->add(QStringLiteral("testid3"), QUrl(QStringLiteral("https://example.org/secure.png")), QStringLiteral("image/png"), false);
         QCOMPARE(model->property("count").toInt(), 3);
         QCOMPARE(model->rowCount(), 3);
     }
 
+    void shouldPruneIncognitoDownloads()
+    {
+        model->add(QStringLiteral("testid1"), QUrl(QStringLiteral("http://example.org/1")), QStringLiteral("text/plain"), false);
+        model->add(QStringLiteral("testid2"), QUrl(QStringLiteral("http://example.org/2")), QStringLiteral("text/plain"), true);
+        model->add(QStringLiteral("testid3"), QUrl(QStringLiteral("http://example.org/3")), QStringLiteral("text/plain"), false);
+        model->add(QStringLiteral("testid4"), QUrl(QStringLiteral("http://example.org/4")), QStringLiteral("text/plain"), true);
+        QCOMPARE(model->rowCount(), 4);
+        QSignalSpy spyRowsRemoved(model, SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+        QSignalSpy spyRowCountChanged(model, SIGNAL(rowCountChanged()));
+        model->pruneIncognitoDownloads();
+        QCOMPARE(model->rowCount(), 2);
+        QCOMPARE(model->data(model->index(0), DownloadsModel::DownloadId).toString(), QStringLiteral("testid3"));
+        QCOMPARE(model->data(model->index(1), DownloadsModel::DownloadId).toString(), QStringLiteral("testid1"));
+        QCOMPARE(spyRowsRemoved.count(), 2);
+        QCOMPARE(spyRowCountChanged.count(), 2);
+    }
+
+    void shouldFailToMoveInvalidDownload()
+    {
+        model->add(QStringLiteral("testid"), QUrl(QStringLiteral("http://example.org/")), QStringLiteral("text/plain"), false);
+        QTemporaryFile tempFile;
+        tempFile.open();
+        QSignalSpy spy(model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+        model->moveToDownloads(QStringLiteral("foobar"), tempFile.fileName());
+        QVERIFY(spy.isEmpty());