webbrowser-app

Merge lp:~uriboni/webbrowser-app/topsite-previews into lp:webbrowser-app

topsite-previews
Merge into trunk

Proposed by Ugo Riboni on 2015-09-01

Status:	Merged
Approved by:	Olivier Tilloy on 2015-10-13
Approved revision:	1204
Merged at revision:	1228
Proposed branch:	lp:~uriboni/webbrowser-app/topsite-previews
Merge into:	lp:webbrowser-app
Diff against target:	1917 lines (+957/-198) 25 files modified src/app/webbrowser/Browser.qml (+37/-29) src/app/webbrowser/BrowserTab.qml (+23/-19) src/app/webbrowser/CMakeLists.txt (+1/-1) src/app/webbrowser/HistoryModel.qml (+0/-24) src/app/webbrowser/HistoryView.qml (+12/-4) src/app/webbrowser/HistoryViewWide.qml (+19/-10) src/app/webbrowser/NewTabView.qml (+55/-18) src/app/webbrowser/NewTabViewWide.qml (+15/-28) src/app/webbrowser/PreviewManager.qml (+91/-0) src/app/webbrowser/SettingsPage.qml (+2/-3) src/app/webbrowser/UrlPreviewDelegate.qml (+123/-0) src/app/webbrowser/UrlPreviewGrid.qml (+90/-0) src/app/webbrowser/file-operations.cpp (+7/-0) src/app/webbrowser/file-operations.h (+3/-0) src/app/webbrowser/qmldir (+1/-0) src/app/webbrowser/webbrowser-app.cpp (+8/-1) tests/autopilot/webbrowser_app/emulators/browser.py (+41/-8) tests/autopilot/webbrowser_app/tests/__init__.py (+12/-6) tests/autopilot/webbrowser_app/tests/test_new_tab_view.py (+5/-6) tests/autopilot/webbrowser_app/tests/test_site_previews.py (+168/-0) tests/unittests/qml/tst_BrowserTab.qml (+64/-1) tests/unittests/qml/tst_HistoryViewWide.qml (+12/-6) tests/unittests/qml/tst_NewTabViewWide.qml (+27/-32) tests/unittests/qml/tst_PreviewManager.qml (+117/-0) tests/unittests/qml/tst_QmlTests.cpp (+24/-2)
To merge this branch:	bzr merge lp:~uriboni/webbrowser-app/topsite-previews
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2015-09-01	Approve on 2015-10-13
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-10-12
Review via email: mp+269771@code.launchpad.net

Commit Message

Reimplement the top sites list to use a grid of previews in all form factors.

Description of the Change

Reimplement the top sites list to use a grid of previews in all form factors.

PS Jenkins bot (ps-jenkins) wrote on 2015-09-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2150/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-03:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2170/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2174/rebuild

review: Needs Fixing (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-09-04:

Please revert the changes to po/webbrowser-app.pot.

Additionally, this branch has conflicts when merging into the latest trunk. Can you please resolve them?

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-09-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2192/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2199/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-09:

FAILED: Continuous integration, rev:1169
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2210/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4091/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/964/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/964/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/964/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4088/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2210/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-09:

FAILED: Continuous integration, rev:1170
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2211/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4093/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/965/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/965/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/965/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4090/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2211/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-10:

FAILED: Continuous integration, rev:1162
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2213/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4099/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/967/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/967/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/967/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4096/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2213/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2215/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-11:

FAILED: Continuous integration, rev:1172
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2223/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/977/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/977/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/977/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4123/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2223/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-11:

FAILED: Continuous integration, rev:1176
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2226/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/980/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/980/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/980/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4137/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2226/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2228/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2244/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2313/rebuild

review: Needs Fixing (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-10-06:

A first incomplete round of (mostly) functional review, with comments in no particular order:

In UrlPreviewDelegate.hide_from_history(), the comment mentions bug #1205144, which has been fixed in the UITK, so the hack can now be cleaned up. Same in test_new_tab_view.py.

When launching the app, I’m seeing the following error in the console:
src/app/webbrowser/Browser.qml:377:30: Unable to assign [undefined] to bool

When opening a new tab, I’m seeing the following error in the console:
src/app/webbrowser/Browser.qml:518: ReferenceError: UrlUtils is not defined

I don’t think this is a bug introduced by your changes, rather an issue that’s always been there, but it is now more visible: initially, the captures for my top sites grid are blank (expected). If from there I click on one top site to open it, wait for the page to load, then close the tab, and open a new tab again, there is no capture for the page that I just viewed. This is because a capture is not made when closing a tab (only when switching tabs). Not sure how much work this would require to implement, but worth taking a look anyway.

On a related note, can captures be removed when closing tabs? I thought this was implemented already, but it doesn’t seem to work.

The captures in the grid view look very blurry, is this because of downscaling, and if so can we do something to improve it?

In narrow mode, when dragging the grid view upwards, it overlaps with the list of bookmarks above. It needs to be clipped.

The context menu that appears on grid items when long-pressing/right-clicking can be dismissed when clicked outside, but the click is propagated to whatever’s underneath, so if I click anywhere to dismiss the menu I might activate a top site.

Not a big deal as (AFAIK) keyboard navigation was never implemented in narrow views, but since the grid view handles it correctly, can the narrow new tab view be fixed to fully support keyboard nav? If it would require too many changes, I’m fine with leaving it for another branch.

Olivier Tilloy (osomon) wrote on 2015-10-06:

I expressed a concern about app startup performance for the branch where you made the bookmarks model a singleton, and this holds true for the changes done to the history model in this branch. Probably even more so, because the history model is likely to grow substantially over time. Please do some profiling to confirm/invalidate.

In BrowserTab.qml, there are extraneous semi-colons at line ends in JS code, please remove them for consistency.

Olivier Tilloy (osomon) wrote on 2015-10-06:

There used to be a good reason for making the name of the preview file a unique ID as opposed to a hash of the URL, but at the moment I fail to remember that good reason. The relevant revision is http://bazaar.launchpad.net/~phablet-team/webbrowser-app/trunk/revision/823.1.16, unfortunately it doesn’t elaborate on why this was done. I’ll keep thinking about it, I’m pretty sure using the URL was not a good idea for some reason.

Olivier Tilloy (osomon) wrote on 2015-10-07:

I think I remember now why using a hash of the URl wasn’t a good idea: if in a given tab I browse to n different URLs (either by entering a new address or by clicking on links), and if in between each new navigation I switch to another tab and back, this is going to generate n different previews, which are not deleted until the next time the browser is started. The preview cache can easily grow big with unused previews that way, and this is not desirable on devices with a limited amount of storage.

Could the PreviewManager be made more flexible by accepting any string identifier instead of a URL? Previews for top sites could use the corresponding URL, while previews for tabs would use the tab’s unique ID.

Olivier Tilloy (osomon) wrote on 2015-10-07:

In BrowserTab.qml, 'topSites' and 'cachedPreviewUpdated' appear to be unused, can they be removed?

In HistoryViewWide.qml, the diff introduces an extraneous blank line before lastVisitDateDelegate’s onClicked handler, can this be reverted?

In NewTabView.qml, the comment to explain why there is a negative right margin makes sense, but instead of hardcoding it, couldn’t it be bound to "-contentColumn.anchors.rightMargin" ?

In UrlPreviewGrid.qml, do you really need to implement keyboard navigation yourself? I thought GridView already implemented it.

PreviewManager.qml should import Ubuntu.Web 0.2, as it has a reference to cacheLocation.

src/app/webbrowser/qmldir needs to be installed by src/app/webbrowser/CMakeLists.txt

In tests/autopilot/webbrowser_app/tests/__init__.py, it doesn’t look like the result of launch_app() is used anywhere, so the return value could be suppressed.

In test_cleanup_previews_on_startup, is the sleep really necessary? If so, how can we be sure that 0.5 seconds is enough?

In tst_BrowserTab.qml, is the additional import of Ubuntu.Test really needed?

3 out of the 4 tests in webbrowser_app.tests.test_site_previews fail in narrow mode because they silently assume wide mode (in narrow mode, before calling self.open_new_tab(), the test needs to call self.open_tabs_view()).

review: Needs Fixing

Ugo Riboni (uriboni) wrote on 2015-10-07:

> A first incomplete round of (mostly) functional review, with comments in no
> particular order:

Fixed unless noted below:

> In UrlPreviewDelegate.hide_from_history(), the comment mentions bug #1205144,
> which has been fixed in the UITK, so the hack can now be cleaned up. Same in
> test_new_tab_view.py.

We still can't use the CPO's method to click on an action because of another bug.
We can however get the action button by objectName, so I fixed that at least.

> I don’t think this is a bug introduced by your changes, rather an issue that’s
> always been there, but it is now more visible: initially, the captures for my
> top sites grid are blank (expected). If from there I click on one top site to
> open it, wait for the page to load, then close the tab, and open a new tab
> again, there is no capture for the page that I just viewed. This is because a
> capture is not made when closing a tab (only when switching tabs). Not sure
> how much work this would require to implement, but worth taking a look anyway.

The other case when the preview is not captured is when we navigate somewhere else, and while we might be able to delay the unloading of the tab, I don't know if we can't easily delay navigating away on a link click.

This idea of delaying hiding the tab is also making me a bit nervous anyway. Would it be too expensive CPU-wise to periodically call grabToImage without saving to disk, and saving to disk only when the tab stops being visible or the URL changes ?

> On a related note, can captures be removed when closing tabs? I thought this
> was implemented already, but it doesn’t seem to work.

It is implemented and I tested it again and it works here.
Can you give me steps to reproduce this problem ?
Please keep in mind that when closing a tab, if the site is in the top sites its preview will not be deleted.

> The context menu that appears on grid items when long-pressing/right-clicking
> can be dismissed when clicked outside, but the click is propagated to
> whatever’s underneath, so if I click anywhere to dismiss the menu I might
> activate a top site.

This sounds like a bug in the ActionSelectionPopover not setting up the exclusion area correctly.
I will investigate more and file a bug.

> Not a big deal as (AFAIK) keyboard navigation was never implemented in narrow
> views, but since the grid view handles it correctly, can the narrow new tab
> view be fixed to fully support keyboard nav? If it would require too many
> changes, I’m fine with leaving it for another branch.

The real problem with the narrow mode version is that it uses a Column+Repeater setup. I plan to convert that into a proper ListView to get better performance, and keyboard navigation will work almost "for free" after that.
So let's keep it for that other MR.

PS Jenkins bot (ps-jenkins) wrote on 2015-10-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2329/rebuild

review: Needs Fixing (continuous-integration)

Ugo Riboni (uriboni) wrote on 2015-10-08:

> In UrlPreviewGrid.qml, do you really need to implement keyboard navigation
> yourself? I thought GridView already implemented it.

What it does not implement is telling me when we are on item zero and pressing LEFT or when we are on any item on row zero and pressing UP. In these cases we need to signal that we want to give up focus so that it can go back to the address bar.
But the handlers for DOWN and RIGHT were indeed redundant so I removed them.

> PreviewManager.qml should import Ubuntu.Web 0.2, as it has a reference to
> cacheLocation.

I guess the reason why this worked anyway was that the context object exported by the Ubuntu.Web plugin is attached the first time the plugin is imported, and then accessible globally since all QML files in webbrowser-app share the same context.

I personally think that we should re-think our usage of context properties and context objects. They make things harder to unit test, since there does not seem to be a way to set up the same environment (with mocks replacing the original context properties) while setting up a unit test. Wouldn't it be better if instead the plugins would export their globals as part of explicit singletons, which can then easily be extended and/or replaced while unit testing ?
Referencing cacheLocation or globals.cacheLocations or something similarly explicit isn't such a major change in the app, compared to the benefits we get.

Anyway, fixed here, but we should discuss this.

> In test_cleanup_previews_on_startup, is the sleep really necessary? If so, how
> can we be sure that 0.5 seconds is enough?

We really can't. Like all tests that are checking that something does *not* happen, we have to either make a guess, or just decide that we can't test this particular feature.
I am happy to take your guess over mine, if you want to suggest a different value, or have a more rationally explainable value to propose.

> 3 out of the 4 tests in webbrowser_app.tests.test_site_previews fail in narrow
> mode because they silently assume wide mode (in narrow mode, before calling
> self.open_new_tab(), the test needs to call self.open_tabs_view()).

In the process of fixing this

Olivier Tilloy (osomon) wrote on 2015-10-08:

In narrow mode, the highlight for top site previews is cut off on the left hand side for the leftmost column.

Also, keyboard navigation with arrows doesn’t ensure that the currently highlighted preview is visible (if e.g. the last row is out of sight and I navigate down to it with the down arrow key, it should come into view).

review: Needs Fixing

Olivier Tilloy (osomon) wrote on 2015-10-08:

I can reliably reproduce the following issue:

- ensure that webbrowser-app is not running
- rm $HOME/.cache/webbrowser-app/captures/*
- launch webbrowser-app, open a new tab, verify that there are no captures
- open each top site in a new tab, and ensure that they all have a capture displayed
- close all tabs, when the last tab is closed, the app quits
- verify that you have (at least) 10 captures in $HOME/.cache/webbrowser-app/captures
- launch webbrowser-app again, and open a new tab
- the captures are gone, for some (wrong) reason they’ve been purged from the cache

review: Needs Fixing

Olivier Tilloy (osomon) wrote on 2015-10-08:

Revision 1195 fixes the issue indeed, but is a bit convoluted. Given that the session restore code is already itself triggered by a Timer with a 1msec interval to ensure it’s out of the critical startup path, maybe the databasePath of the history model could be set in that same timer’s onTriggered (after restoring the open tabs). That would avoid the need for a 'sessionRestoreComplete' property and the getOpenPages() and initialCapturesCleanup() functions.

PS Jenkins bot (ps-jenkins) wrote on 2015-10-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2333/rebuild

review: Needs Fixing (continuous-integration)

Ugo Riboni (uriboni) wrote on 2015-10-08:

> Revision 1195 fixes the issue indeed, but is a bit convoluted. Given that the
> session restore code is already itself triggered by a Timer with a 1msec
> interval to ensure it’s out of the critical startup path, maybe the
> databasePath of the history model could be set in that same timer’s
> onTriggered (after restoring the open tabs). That would avoid the need for a
> 'sessionRestoreComplete' property and the getOpenPages() and
> initialCapturesCleanup() functions.

I fixed this but we still need getOpenPages because the open tabs are a combination of restored tabs and initialTabs (which I think come from the command line)

Ugo Riboni (uriboni) wrote on 2015-10-08:

> In narrow mode, the highlight for top site previews is cut off on the left
> hand side for the leftmost column.

Was due to clipping. Fixed.

> Also, keyboard navigation with arrows doesn’t ensure that the currently
> highlighted preview is visible (if e.g. the last row is out of sight and I
> navigate down to it with the down arrow key, it should come into view).

The issue here is that we are using a flickable around the GridView, and the GridView height equals its contentHeight, so as far as the GridView is concerned there is nothing to scroll.

I will fix this when adding full support for keyboard nav to the narrow view list (and replacing columns+repeaters with listviews) in a separate MR.

Olivier Tilloy (osomon) wrote on 2015-10-08:

> I will fix this when adding full support for keyboard nav to the narrow view
> list (and replacing columns+repeaters with listviews) in a separate MR.

Okay.

Olivier Tilloy (osomon) wrote on 2015-10-08:

A couple of minor comments, we’re definitely getting there!

- Given that internal.getOpenPages() is called in only one place, its usefulness as a function is low. Can you inline that code in the onTriggered implementation of the timer?

- The interactive property of the grid view in narrow mode should be set to false, otherwise if I start flicking on the grid only the grid moves, whereas I would expect the entire page to move.

I haven’t tested on a device yet (to ensure no functional regressions in narrow mode on touch), will do when CI generates packages for the latest revision.

PS Jenkins bot (ps-jenkins) wrote on 2015-10-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2336/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2339/rebuild

review: Needs Fixing (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-10-09:

Testing on arale, and I can confirm that the fact that the gridview is flickable inside the containing flickable is annoying, if I scroll all the way down I cannot scroll back up to see the list of bookmarks.

I’m also seeing that the capture images are vertically centered inside the ubuntu shape, which sometimes makes it hard to identify a page by its capture. An extreme example is http://example.org, where all the content is at the top of the page, and by centering the capture the grid item ends up completely white, as the content is clipped off at the top. A similar situation happens with http://google.com, where the preview shows only the links below the search box.
I would expect the captures to be top-aligned, I think it’s generally easier to recognize a page when seeing its topmost part.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-10-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2346/rebuild

review: Needs Fixing (continuous-integration)

Olivier Tilloy (osomon) wrote on 2015-10-13:

LGTM now, thanks!

review: Approve

Olivier Tilloy (osomon) wrote on 2015-10-13:

webbrowser_app.tests.test_new_tab_view.TestNewTabViewContentsWide.test_remove_top_sites is failing on desktop, please fix it.

review: Needs Fixing

Olivier Tilloy (osomon) on 2015-10-13:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Ubuntu Phablet Team

Ugo Riboni

to status/vote changes:

Rachel Liu

 === modified file 'src/app/webbrowser/Browser.qml'
 --- src/app/webbrowser/Browser.qml	2015-09-28 08:15:10 +0000
 +++ src/app/webbrowser/Browser.qml	2015-10-13 11:21:13 +0000
@@ -25,8 +25,9 @@
  import webbrowserapp.private 0.1
  import webbrowsercommon.private 0.1
  import "../actions" as Actions
++import "../UrlUtils.js" as UrlUtils
  import ".."
--import "../UrlUtils.js" as UrlUtils
++import "."
  BrowserView {
      id: browser
@@ -36,7 +37,6 @@
      currentWebview: tabsModel && tabsModel.currentTab ? tabsModel.currentTab.webview : null
--    property var historyModel: (historyModelLoader.status == Loader.Ready) ? historyModelLoader.item : null
      property var bookmarksModel: (bookmarksModelLoader.status == Loader.Ready) ? bookmarksModelLoader.item : null
      property bool newSession: false
@@ -99,8 +99,7 @@
              onTriggered: browser.openUrlInNewTab("", true)
          },
          Actions.ClearHistory {
--            enabled: browser.historyModel
--            onTriggered: browser.historyModel.clearAll()
++            onTriggered: HistoryModel.clearAll()
          },
          Actions.FindInPage {
              enabled: !chrome.findInPageMode && !newTabViewLoader.active
@@ -242,7 +241,6 @@
                  NewTabView {
                      anchors.fill: parent
--                    historyModel: browser.historyModel
                      bookmarksModel: browser.bookmarksModel
                      settingsObject: settings
                      focus: true
@@ -265,7 +263,6 @@
                  NewTabViewWide {
                      anchors.fill: parent
--                    historyModel: browser.historyModel
                      bookmarksModel: browser.bookmarksModel
                      settingsObject: settings
                      focus: true
@@ -374,7 +371,6 @@
                      objectName: "history"
                      text: i18n.tr("History")
                      iconName: "history"
--                    enabled: browser.historyModel
                      onTriggered: historyViewLoader.active = true
                  },
                  Action {
@@ -492,7 +488,7 @@
                  readonly property string icon: "history"
                  readonly property bool displayUrl: true
                  sourceModel: TextSearchFilterModel {
--                    sourceModel: browser.historyModel
++                    sourceModel: HistoryModel
                      terms: suggestionsList.searchTerms
                      searchFields: ["url", "title"]
+                 }
@@ -771,7 +767,7 @@
          onStatusChanged: {
              if (status == Loader.Ready) {
--                historyViewTimer.restart()
++                historyViewLoader.item.loadModel()
                  historyViewLoader.item.forceActiveFocus()
              } else {
                  internal.resetFocus()
@@ -782,14 +778,6 @@
          onActiveChanged: if (active) chrome.findInPageMode = false
--        Timer {
--            id: historyViewTimer
--            // Set the model asynchronously to ensure
--            // the view is displayed as early as possible.
--            interval: 1
--            onTriggered: historyViewLoader.item.historyModel = browser.historyModel
--        }
--
          Component {
              id: historyViewComponent
@@ -822,7 +810,7 @@
                                  if (count == 1) {
                                      done()
+                                 }
--                                browser.historyModel.removeEntryByUrl(url)
++                                HistoryModel.removeEntryByUrl(url)
+                             }
                              onDone: destroy()
+                         }
@@ -846,6 +834,7 @@
                      browser.openUrlInNewTab(url, true)
                      done()
+                 }
++
                  onNewTabRequested: browser.openUrlInNewTab("", true)
                  onDone: historyViewLoader.active = false
+             }
@@ -864,7 +853,6 @@
              SettingsPage {
                  anchors.fill: parent
                  focus: true
--                historyModel: browser.historyModel
                  settingsObject: settings
                  onDone: destroy()
                  Keys.onEscapePressed: {
@@ -901,12 +889,6 @@
+     }
      Loader {
--        id: historyModelLoader
--        source: "HistoryModel.qml"
--        asynchronous: true
--    }
--
--    Loader {
          id: bookmarksModelLoader
          source: "BookmarksModel.qml"
          asynchronous: true
@@ -1128,8 +1110,9 @@
                          return
+                     }
--                    if ((event.type == Oxide.LoadEvent.TypeSucceeded) && browser.historyModel && 300 > event.httpStatusCode && event.httpStatusCode >= 200) {
--                        browser.historyModel.add(event.url, title, icon)
++                    if (event.type == Oxide.LoadEvent.TypeSucceeded &&
++                        300 > event.httpStatusCode && event.httpStatusCode >= 200) {
++                        HistoryModel.add(event.url, title, icon)
+                     }
+                 }
@@ -1227,6 +1210,15 @@
      QtObject {
          id: internal
++        function getOpenPages() {
++            var urls = [];
++            for (var i = 0; i < tabsModel.count; i++) {
++                var url = tabsModel.get(i).url
++                if (url.length > 0) urls.push(url) // exclude "new tab" tabs
++            }
++            return urls;
++        }
++
          function instantiateShareComponent() {
              var component = Qt.createComponent("../Share.qml")
              if (component.status == Component.Ready) {
@@ -1490,8 +1482,18 @@
+         }
+     }
--    // Delay instantiation of the first webview by 1 msec to allow initial
--    // rendering to happen. Clumsy workaround for http://pad.lv/1359911.
++    // Schedule various expensive tasks to a point after the initialization and
++    // first rendering of the application have already happened.
++    //
++    // Scheduling a Timer with the shortest non-zero interval possible (1ms) will
++    // effectively queue its onTriggered function to run immediately after anything
++    // that is currently in the event loop queue at the moment the Timer starts.
++    //
++    // The tasks are:
++    // - creating the webviews for all initial tabs. This should ideally be done
++    //   asynchronously via object incubation, but http://pad.lv/1359911 prevents it
++    // - loading the HistoryModel from the database
++    // - deleting any page screenshots that are no longer needed
      Timer {
          running: true
          interval: 1
@@ -1499,6 +1501,7 @@
              if (!browser.newSession && settings.restoreSession) {
                  session.restore()
+             }
++
              // Sanity check
              console.assert(tabsModel.count <= browser.maxTabsToRestore,
                             "WARNING: too many tabs were restored")
@@ -1512,6 +1515,11 @@
              if (!tabsModel.currentTab.url.toString() && !tabsModel.currentTab.restoreState && (formFactor == "desktop")) {
                  internal.focusAddressBar()
+             }
++
++            HistoryModel.databasePath = dataLocation + "/history.sqlite"
++            // Note that the property setter for databasePath won't return until
++            // the entire model has been loaded, so it is safe to call this here
++            PreviewManager.cleanUnusedPreviews(internal.getOpenPages())
+         }
+     }
 === modified file 'src/app/webbrowser/BrowserTab.qml'
 --- src/app/webbrowser/BrowserTab.qml	2015-09-23 15:53:01 +0000
 +++ src/app/webbrowser/BrowserTab.qml	2015-10-13 11:21:13 +0000
@@ -20,6 +20,7 @@
  import Ubuntu.Web 0.2
  import com.canonical.Oxide 1.4 as Oxide
  import webbrowserapp.private 0.1
++import "."
  FocusScope {
      id: tab
@@ -40,6 +41,19 @@
      property bool current: false
      property bool incognito
++    Connections {
++        target: PreviewManager
++        onPreviewSaved: {
++            if (pageUrl !== url) return
++            if (preview == previewUrl) {
++                // Ensure that the preview URL actually changes,
++                // for the image to be reloaded
++                preview = ""
++            }
++            preview = previewUrl
++        }
++    }
++
      FocusScope {
          id: webviewContainer
          anchors.fill: parent
@@ -81,9 +95,7 @@
      function close() {
          unload()
--        if (preview && preview.toString()) {
--            FileOperations.remove(preview)
--        }
++        PreviewManager.checkDelete(url)
          destroy()
+     }
@@ -110,6 +122,12 @@
                  visible = false
                  return
+             }
++
++            if (url.toString().length === 0) {
++                visible = false
++                return
++            }
++
              internal.hiding = true
              webview.grabToImage(function(result) {
                  if (!internal.hiding) {
@@ -117,22 +135,8 @@
+                 }
                  internal.hiding = false
                  visible = false
--                var capturesDir = cacheLocation + "/captures"
--                if (!FileOperations.exists(Qt.resolvedUrl(capturesDir))) {
--                    FileOperations.mkpath(Qt.resolvedUrl(capturesDir))
--                }
--                var filepath = capturesDir + "/" + uniqueId + ".jpg"
--                if (result.saveToFile(filepath)) {
--                    var previewUrl = Qt.resolvedUrl(filepath)
--                    if (preview == previewUrl) {
--                        // Ensure that the preview URL actually changes,
--                        // for the image to be reloaded
--                        preview = ""
--                    }
--                    preview = previewUrl
--                } else {
--                    preview = ""
--                }
++
++                PreviewManager.saveToDisk(result, url)
              })
+         }
+     }
 === modified file 'src/app/webbrowser/CMakeLists.txt'
 --- src/app/webbrowser/CMakeLists.txt	2015-09-22 01:27:19 +0000
 +++ src/app/webbrowser/CMakeLists.txt	2015-10-13 11:21:13 +0000
@@ -56,7 +56,7 @@
  install(TARGETS ${WEBBROWSER_APP}
          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--file(GLOB QML_FILES *.qml *.js)
++file(GLOB QML_FILES *.qml qmldir *.js)
  install(FILES ${QML_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webbrowser)
  install(DIRECTORY assets
 === removed file 'src/app/webbrowser/HistoryModel.qml'
 --- src/app/webbrowser/HistoryModel.qml	2015-08-10 15:22:00 +0000
 +++ src/app/webbrowser/HistoryModel.qml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
--/*
-- * Copyright 2014-2015 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 webbrowserapp.private 0.1
--
--HistoryModel {
--    databasePath: dataLocation + "/history.sqlite"
--}
 === modified file 'src/app/webbrowser/HistoryView.qml'
 --- src/app/webbrowser/HistoryView.qml	2015-08-10 15:22:00 +0000
 +++ src/app/webbrowser/HistoryView.qml	2015-10-13 11:21:13 +0000
@@ -23,8 +23,6 @@
  Item {
      id: historyView
--    property alias historyModel: historyTimeframeModel.sourceModel
--
      signal seeMoreEntriesClicked(var model)
      signal done()
@@ -33,6 +31,16 @@
          color: "#f6f6f6"
+     }
++    Timer {
++        // Set the model asynchronously to ensure
++        // the view is displayed as early as possible.
++        id: loadModelTimer
++        interval: 1
++        onTriggered: historyTimeframeModel.sourceModel = HistoryModel
++    }
++
++    function loadModel() { loadModelTimer.restart() }
++
      ListView {
          id: domainsListView
@@ -75,7 +83,7 @@
                      historyView.seeMoreEntriesClicked(model.entries)
+                 }
+             }
--            onRemoved: historyView.historyModel.removeEntriesByDomain(model.domain)
++            onRemoved: HistoryModel.removeEntriesByDomain(model.domain)
              onPressAndHold: {
                  selectMode = !selectMode
                  if (selectMode) {
@@ -220,7 +228,7 @@
+                         }
                          domainsListView.ViewItems.selectMode = false
                          for (var j in domains) {
--                            historyModel.removeEntriesByDomain(domains[j])
++                            HistoryModel.removeEntriesByDomain(domains[j])
+                         }
+                     }
+                 }
 === modified file 'src/app/webbrowser/HistoryViewWide.qml'
 --- src/app/webbrowser/HistoryViewWide.qml	2015-09-18 20:43:26 +0000
 +++ src/app/webbrowser/HistoryViewWide.qml	2015-10-13 11:21:13 +0000
@@ -25,7 +25,6 @@
  FocusScope {
      id: historyViewWide
--    property alias historyModel: historySearchModel.sourceModel
      property bool searchMode: false
      readonly property bool selectMode: urlsListView.ViewItems.selectMode
      onSearchModeChanged: {
@@ -57,15 +56,16 @@
              internal.removeSelected()
          } else {
              if (urlsListView.activeFocus) {
--                historyViewWide.historyModel.removeEntryByUrl(urlsListView.currentItem.siteUrl)
++                HistoryModel.removeEntryByUrl(urlsListView.currentItem.siteUrl)
++
                  if (urlsListView.count == 0) {
                      lastVisitDateListView.currentIndex = 0
+                 }
              } else {
                  if (lastVisitDateListView.currentIndex == 0) {
--                    historyViewWide.historyModel.clearAll()
++                    HistoryModel.clearAll()
                  } else {
--                    historyViewWide.historyModel.removeEntriesByDate(lastVisitDateListView.currentItem.lastVisitDate)
++                    HistoryModel.removeEntriesByDate(lastVisitDateListView.currentItem.lastVisitDate)
                      lastVisitDateListView.currentIndex = 0
+                 }
+             }
@@ -82,6 +82,16 @@
          anchors.fill: parent
+     }
++    Timer {
++        // Set the model asynchronously to ensure
++        // the view is displayed as early as possible.
++        id: loadModelTimer
++        interval: 1
++        onTriggered: historySearchModel.sourceModel = HistoryModel
++    }
++
++    function loadModel() { loadModelTimer.restart() }
++
      TextSearchFilterModel {
          id: historySearchModel
          searchFields: ["title", "url"]
@@ -239,8 +249,8 @@
                      // Until a valid HistoryModel is assigned the TextSearchFilterModel
                      // will not report role names, and the HistoryLastVisit*Models will emit warnings
                      // since they need a dateLastVisit role to be present.
--                    // We avoid this by assigning the sourceModel only when HistoryModel is ready.
--                    sourceModel: historyModel ? historySearchModel : undefined
++                    // We avoid this by delaying assigning the source model until it is ready.
++                    sourceModel: historySearchModel.sourceModel ? historySearchModel : undefined
+                 }
                  clip: true
@@ -309,7 +319,7 @@
+                     }
                      onRemoved: {
--                        historyViewWide.historyModel.removeEntryByUrl(model.url)
++                        HistoryModel.removeEntryByUrl(model.url)
                          if (urlsListView.count == 0) {
                              lastVisitDateListView.currentIndex = 0
+                         }
@@ -360,8 +370,7 @@
          ToolbarAction {
              objectName: "backButton"
--            visible: urlsListView.ViewItems.selectMode ||
--                     historyViewWide.searchMode
++            visible: historyViewWide.selectMode || historyViewWide.searchMode
              anchors {
                  top: parent.top
@@ -545,7 +554,7 @@
              urlsListView.ViewItems.selectMode = false
              for (var j in urls) {
--                historyViewWide.historyModel.removeEntryByUrl(urls[j])
++                HistoryModel.removeEntryByUrl(urls[j])
+             }
              lastVisitDateListView.forceActiveFocus()
 === modified file 'src/app/webbrowser/NewTabView.qml'
 --- src/app/webbrowser/NewTabView.qml	2015-08-10 15:22:00 +0000
 +++ src/app/webbrowser/NewTabView.qml	2015-10-13 11:21:13 +0000
@@ -21,12 +21,12 @@
  import Ubuntu.Components 1.3
  import webbrowserapp.private 0.1
  import ".."
++import "."
  Item {
      id: newTabView
      property QtObject bookmarksModel
--    property alias historyModel: historyTimeframeModel.sourceModel
      property Settings settingsObject
      signal bookmarkClicked(url url)
@@ -37,6 +37,7 @@
          id: topSitesModel
          sourceModel: HistoryTimeframeModel {
              id: historyTimeframeModel
++            sourceModel: HistoryModel
+         }
+     }
@@ -148,7 +149,7 @@
                  active: internal.seeMoreBookmarksView
                  sourceComponent: BookmarksFolderListView {
--                    model: newTabView.bookmarksModel
++                    model: newTabView.bookmarksModel
                      onBookmarkClicked: newTabView.bookmarkClicked(url)
                      onBookmarkRemoved: newTabView.bookmarkRemoved(url)
@@ -232,7 +233,7 @@
                  height: units.gu(0.1)
                  anchors {
                      left: parent.left
--                    leftMargin: units.gu(1.5)
++                    leftMargin: units.gu(2)
                      right: parent.right
+                 }
                  color: "#d3d3d3"
@@ -258,24 +259,60 @@
                  color: UbuntuColors.darkGrey
+             }
--            UrlsList {
--                objectName: "topSitesList"
++            Item {
                  anchors {
                      left: parent.left
                      right: parent.right
--                }
--
--                opacity: internal.seeMoreBookmarksView ? 0.0 : 1.0
--                Behavior on opacity { UbuntuNumberAnimation {} }
--                visible: opacity > 0
--
--                limit: 10
--                spacing: 0
--
--                model: topSitesModel
--
--                onUrlClicked: newTabView.historyEntryClicked(url)
--                onUrlRemoved: newTabView.historyModel.hide(url)
++
++                    // The UrlPreviewGrid's highlight extends to the left of the
++                    // grid itself by a margin.
++                    // Since we are clipping the parent we need to prevent the
++                    // highlight from being clipped away at the left edge.
++                    // We do this by shifting the parent left and the contents right
++                    // by an amount equal to the highlight's margin.
++                    leftMargin: units.gu(2) - grid.horizontalMargin
++
++                    // The right margin should be 2gu, which is set on all cells
++                    // of the UrlPreviewGrid already. However the parent Column
++                    // has 1.5gu right margin, so we are compensating for that
++                    // here instead of removing it from the Column itself and
++                    // reassigning it to all Column children except this one.
++                    rightMargin: - contentColumn.anchors.rightMargin
++                }
++                height: childrenRect.height
++                clip: true
++
++                UrlPreviewGrid {
++                    id: grid
++                    objectName: "topSitesList"
++                    anchors {
++                        left: parent.left
++                        leftMargin: grid.horizontalMargin
++                        right: parent.right
++                        top: parent.top
++                        topMargin: units.gu(2)
++                    }
++
++                    horizontalMargin: units.gu(1)
++                    verticalMargin: units.gu(1)
++
++                    opacity: internal.seeMoreBookmarksView ? 0.0 : 1.0
++                    Behavior on opacity { UbuntuNumberAnimation {} }
++                    visible: opacity > 0
++                    interactive: false
++
++                    model: LimitProxyModel {
++                        limit: 10
++                        sourceModel: topSitesModel
++                    }
++                    showFavicons: false
++
++                    onActivated: newTabView.historyEntryClicked(url)
++                    onRemoved: {
++                        HistoryModel.hide(url)
++                        PreviewManager.checkDelete(url)
++                    }
++                }
+             }
+         }
+     }
 === modified file 'src/app/webbrowser/NewTabViewWide.qml'
 --- src/app/webbrowser/NewTabViewWide.qml	2015-09-08 09:28:47 +0000
 +++ src/app/webbrowser/NewTabViewWide.qml	2015-10-13 11:21:13 +0000
@@ -21,12 +21,12 @@
  import Ubuntu.Components 1.3
  import webbrowserapp.private 0.1
  import ".."
++import "."
  FocusScope {
      id: newTabViewWide
      property QtObject bookmarksModel
--    property alias historyModel: historyTimeframeModel.sourceModel
      property QtObject settingsObject
      property alias selectedIndex: sections.selectedIndex
      readonly property bool inBookmarksView: newTabViewWide.selectedIndex === 1
@@ -57,6 +57,7 @@
          sourceModel: TopSitesModel {
              sourceModel: HistoryTimeframeModel {
                  id: historyTimeframeModel
++                sourceModel: HistoryModel
+             }
+         }
+     }
@@ -233,7 +234,7 @@
          flickableItem: bookmarksList
+     }
--    ListView {
++    UrlPreviewGrid {
          id: topSitesList
          objectName: "topSitesList"
          anchors {
@@ -241,36 +242,22 @@
              bottom: parent.bottom
              left: parent.left
              right: parent.right
--            topMargin: units.gu(2)
++            topMargin: units.gu(3)
++            leftMargin: units.gu(4)
+         }
          visible: !inBookmarksView
--        currentIndex: 0
          model: topSitesModel
--        delegate: UrlDelegateWide {
--            objectName: "topSiteItem"
--            clip: true
--
--            title: model.title
--            icon: model.icon
--            url: model.url
--            highlighted: topSitesList.activeFocus && ListView.isCurrentItem
--
--            onClicked: newTabViewWide.historyEntryClicked(url)
--            onRemoved: newTabViewWide.historyModel.hide(url)
--        }
--
--        Keys.onReturnPressed: newTabViewWide.historyEntryClicked(currentItem.url)
--        Keys.onDeletePressed: {
--            newTabViewWide.historyModel.hide(currentItem.url)
--            if (topSitesList.model.count === 0) newTabViewWide.releasingKeyboardFocus()
--        }
--        Keys.onDownPressed: currentIndex = Math.min(currentIndex + 1, model.count - 1)
--        Keys.onUpPressed: {
--            if (currentIndex > 0) currentIndex = Math.max(currentIndex - 1, 0)
--            else newTabViewWide.releasingKeyboardFocus()
--        }
++        showFavicons: true
++
++        onActivated: newTabViewWide.historyEntryClicked(url)
++        onRemoved: {
++            HistoryModel.hide(url)
++            if (topSitesModel.count === 0) newTabViewWide.releasingKeyboardFocus()
++            PreviewManager.checkDelete(url)
++        }
++        onReleasingKeyboardFocus: newTabViewWide.releasingKeyboardFocus()
+     }
      Scrollbar {
@@ -293,7 +280,7 @@
              anchors {
                  left: parent.left
                  top: parent.top
--                leftMargin: units.gu(1)
++                leftMargin: units.gu(2)
+             }
              selectedIndex: settingsObject.newTabDefaultSection
 === added file 'src/app/webbrowser/PreviewManager.qml'
 --- src/app/webbrowser/PreviewManager.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webbrowser/PreviewManager.qml	2015-10-13 11:21:13 +0000
@@ -0,0 +1,91 @@
++/*
++ * Copyright 2015 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/>.
++ */
++
++pragma Singleton
++
++import QtQuick 2.4
++import Ubuntu.Web 0.2
++import webbrowserapp.private 0.1
++
++Item {
++    property string capturesDir: cacheLocation + "/captures"
++    signal previewSaved(url pageUrl, url previewUrl)
++
++    LimitProxyModel {
++        id: topSites
++        limit: 10
++        sourceModel: TopSitesModel {
++            sourceModel: HistoryTimeframeModel {
++                sourceModel: HistoryModel
++            }
++        }
++        function contains(url) {
++            for (var i = 0; i < topSites.count; i++) {
++                if (topSites.get(i).url == url) return true
++            }
++            return false
++        }
++        function containsHash(hash) {
++            for (var i = 0; i < topSites.count; i++) {
++                if (Qt.md5(topSites.get(i).url) == hash) return true
++            }
++            return false
++        }
++    }
++
++    function previewPathFromUrl(url) {
++        return "%1/%2.jpg".arg(capturesDir).arg(Qt.md5(url))
++    }
++
++    function saveToDisk(data, url) {
++        if (!FileOperations.exists(Qt.resolvedUrl(capturesDir))) {
++            FileOperations.mkpath(Qt.resolvedUrl(capturesDir))
++        }
++
++        var filepath = previewPathFromUrl(url)
++        var previewUrl = ""
++        if (data.saveToFile(filepath)) previewUrl = Qt.resolvedUrl(filepath)
++        else console.warn("Failed to save preview to disk for %1 (path is %2)".arg(url).arg(filepath))
++
++        previewSaved(url, previewUrl)
++    }
++
++
++    function checkDelete(url) {
++        if (!topSites.contains(url)) {
++            FileOperations.remove(Qt.resolvedUrl(previewPathFromUrl(url)))
++        }
++    }
++
++    // Remove all previews stored on disk that are not part of the top sites
++    // and that are not for URLs in the doNotCleanUrls list
++    function cleanUnusedPreviews(doNotCleanUrls) {
++        var dir = Qt.resolvedUrl(capturesDir);
++        var previews = FileOperations.filesInDirectory(dir, ["*.jpg"])
++        var doNotCleanHashes = doNotCleanUrls.map(function(url) { return Qt.md5(url) })
++
++        for (var i = 0; i < previews.length; i++) {
++            var hash = previews[i].replace('.jpg', '')
++            if (!topSites.containsHash(hash) &&
++                doNotCleanHashes.indexOf(hash) === -1) {
++                var file = Qt.resolvedUrl("%1/%2.jpg".arg(capturesDir).arg(hash))
++                FileOperations.remove(file)
++            }
++        }
++    }
++}
 === modified file 'src/app/webbrowser/SettingsPage.qml'
 --- src/app/webbrowser/SettingsPage.qml	2015-08-18 08:49:24 +0000
 +++ src/app/webbrowser/SettingsPage.qml	2015-10-13 11:21:13 +0000
@@ -29,7 +29,6 @@
  Item {
      id: settingsItem
--    property QtObject historyModel
      property Settings settingsObject
      signal done()
@@ -247,10 +246,10 @@
                          ListItem.Standard {
                              objectName: "privacy.clearHistory"
                              text: i18n.tr("Clear Browsing History")
--                            enabled: historyModel.count > 0
++                            enabled: HistoryModel.count > 0
                              onClicked: {
                                  var dialog = PopupUtils.open(privacyConfirmDialogComponent, privacyItem, {"title": i18n.tr("Clear Browsing History?")})
--                                dialog.confirmed.connect(historyModel.clearAll)
++                                dialog.confirmed.connect(HistoryModel.clearAll)
+                             }
+                         }
 === added file 'src/app/webbrowser/UrlPreviewDelegate.qml'
 --- src/app/webbrowser/UrlPreviewDelegate.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webbrowser/UrlPreviewDelegate.qml	2015-10-13 11:21:13 +0000
@@ -0,0 +1,123 @@
++/*
++ * Copyright 2015 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 webbrowserapp.private 0.1
++import ".."
++import "."
++
++AbstractButton {
++    id: preview
++
++    property url icon
++    property alias title: titleLabel.text
++    property url url
++    property bool showFavicon: true
++
++    property alias previewHeight: previewShape.height
++    property alias previewWidth: previewShape.width
++
++    signal removed()
++
++    onPressAndHold: PopupUtils.open(contextMenuComponent, previewShape)
++
++    Column {
++        id: contentColumn
++        anchors.left: parent.left
++        anchors.top: parent.top
++        spacing: units.gu(1)
++
++        Item {
++            anchors.left: parent.left
++            anchors.right: parent.right
++            height: titleLabel.height
++
++            Loader {
++                id: favicon
++                anchors.left: parent.left
++                anchors.verticalCenter: parent.verticalCenter
++                sourceComponent: Favicon {
++                    source: preview.icon
++                    anchors.left: parent.left
++                    anchors.verticalCenter: parent.verticalCenter
++                }
++                active: preview.showFavicon
++            }
++
++            Label {
++                id: titleLabel
++                anchors.left: favicon.right
++                anchors.leftMargin: showFavicon ? units.gu(1) : 0
++                anchors.right: parent.right
++                anchors.top: parent.top
++                text: preview.title
++                elide: Text.ElideRight
++                fontSize: "small"
++            }
++        }
++
++        UbuntuShape {
++            id: previewShape
++            anchors.left: parent.left
++            width: units.gu(26)
++            height: units.gu(16)
++
++            source: Image {
++                id: previewImage
++                source: FileOperations.exists(previewShape.previewUrl) ? previewShape.previewUrl : ""
++                sourceSize.width: previewShape.width
++                cache: false
++            }
++            sourceFillMode: UbuntuShape.PreserveAspectCrop
++            sourceHorizontalAlignment: UbuntuShape.AlignLeft
++            sourceVerticalAlignment: UbuntuShape.AlignTop
++
++            property url previewUrl: Qt.resolvedUrl(PreviewManager.previewPathFromUrl(preview.url))
++
++            Connections {
++                target: PreviewManager
++                onPreviewSaved: {
++                    if (pageUrl !== preview.url) return
++                    previewImage.source = ""
++                    previewImage.source = previewShape.previewUrl
++                }
++            }
++        }
++    }
++
++    MouseArea {
++        anchors.fill: contentColumn
++        acceptedButtons: Qt.RightButton
++        onClicked: PopupUtils.open(contextMenuComponent, previewShape)
++    }
++
++    Component {
++        id: contextMenuComponent
++        ActionSelectionPopover {
++            actions: ActionList {
++                Action {
++                    objectName: "delete"
++                    text: i18n.tr("Remove")
++                    onTriggered: preview.removed()
++                }
++            }
++        }
++    }
++}
 === added file 'src/app/webbrowser/UrlPreviewGrid.qml'
 --- src/app/webbrowser/UrlPreviewGrid.qml	1970-01-01 00:00:00 +0000
 +++ src/app/webbrowser/UrlPreviewGrid.qml	2015-10-13 11:21:13 +0000
@@ -0,0 +1,90 @@
++/*
++ * Copyright 2015 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 Qt.labs.settings 1.0
++import Ubuntu.Components 1.3
++import webbrowserapp.private 0.1
++import ".."
++
++GridView {
++    id: grid
++
++    property bool showFavicons: true
++    property int horizontalMargin: units.gu(3)
++    property int verticalMargin: units.gu(2.5)
++    property int previewWidth: units.gu(17)
++    property int previewHeight: units.gu(10)
++
++    signal activated(url url)
++    signal removed(url url)
++    signal releasingKeyboardFocus()
++
++    currentIndex: 0
++
++    cellWidth: previewWidth + horizontalMargin * 2
++    cellHeight: previewHeight + verticalMargin * 2 + units.gu(4) // height of text + favicon + margins in delegate
++
++    implicitHeight: contentItem.childrenRect.height
++
++    delegate: UrlPreviewDelegate {
++        objectName: "topSiteItem"
++        width: grid.cellWidth
++        height: grid.cellHeight
++
++        title: model.title
++        icon: model.icon
++        url: model.url
++        showFavicon: grid.showFavicons
++
++        previewHeight: grid.previewHeight
++        previewWidth: grid.previewWidth
++
++        onClicked: grid.activated(model.url)
++        onRemoved: grid.removed(model.url)
++    }
++
++    highlight: Component {
++        Item {
++            visible: grid.activeFocus
++            UbuntuShape {
++                anchors.fill: parent
++                anchors.leftMargin: - grid.horizontalMargin
++                anchors.rightMargin: grid.horizontalMargin
++                anchors.topMargin: - grid.verticalMargin
++                anchors.bottomMargin: grid.verticalMargin
++                aspect: UbuntuShape.Flat
++                backgroundColor: Qt.rgba(0, 0, 0, 0.05)
++            }
++        }
++    }
++
++    Keys.onDeletePressed: removed(currentItem.url)
++
++    Keys.onLeftPressed: {
++        var i = grid.currentIndex
++        grid.moveCurrentIndexLeft()
++        if (i === grid.currentIndex) grid.releasingKeyboardFocus()
++    }
++
++    Keys.onUpPressed: {
++        var i = grid.currentIndex
++        grid.moveCurrentIndexUp()
++        if (i === grid.currentIndex) grid.releasingKeyboardFocus()
++    }
++}
 === modified file 'src/app/webbrowser/file-operations.cpp'
 --- src/app/webbrowser/file-operations.cpp	2015-02-18 20:31:37 +0000
 +++ src/app/webbrowser/file-operations.cpp	2015-10-13 11:21:13 +0000
@@ -43,3 +43,10 @@
+ {
      return QDir::root().mkpath(path.toLocalFile());
+ }
++
++QStringList FileOperations::filesInDirectory(const QUrl& directory,
++                                             const QStringList& filters) const
++{
++    return QDir(directory.toLocalFile()).entryList(filters,
++                                                   QDir::Files, QDir::Unsorted);
++}
 === modified file 'src/app/webbrowser/file-operations.h'
 --- src/app/webbrowser/file-operations.h	2015-02-18 20:31:37 +0000
 +++ src/app/webbrowser/file-operations.h	2015-10-13 11:21:13 +0000
@@ -20,6 +20,7 @@
  #define __FILE_OPERATIONS_H__
  #include <QtCore/QObject>
++#include <QtCore/QStringList>
  class QUrl;
@@ -33,6 +34,8 @@
      Q_INVOKABLE bool exists(const QUrl& path) const;
      Q_INVOKABLE bool remove(const QUrl& file) const;
      Q_INVOKABLE bool mkpath(const QUrl& path) const;
++    Q_INVOKABLE QStringList filesInDirectory(const QUrl& directory,
++                                             const QStringList& filters) const;
  };
  #endif // __FILE_OPERATIONS_H__
 === added file 'src/app/webbrowser/qmldir'
 --- src/app/webbrowser/qmldir	1970-01-01 00:00:00 +0000
 +++ src/app/webbrowser/qmldir	2015-10-13 11:21:13 +0000
@@ -0,0 +1,1 @@
++singleton PreviewManager 1.0 PreviewManager.qml
 === modified file 'src/app/webbrowser/webbrowser-app.cpp'
 --- src/app/webbrowser/webbrowser-app.cpp	2015-08-19 13:16:06 +0000
 +++ src/app/webbrowser/webbrowser-app.cpp	2015-10-13 11:21:13 +0000
@@ -64,10 +64,17 @@
      return new CacheDeleter();
+ }
++static QObject* HistoryModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
++{
++    Q_UNUSED(engine);
++    Q_UNUSED(scriptEngine);
++    return new HistoryModel();
++}
++
  bool WebbrowserApp::initialize()
+ {
      const char* uri = "webbrowserapp.private";
--    qmlRegisterType<HistoryModel>(uri, 0, 1, "HistoryModel");
++    qmlRegisterSingletonType<HistoryModel>(uri, 0, 1, "HistoryModel", HistoryModel_singleton_factory);
      qmlRegisterType<HistoryTimeframeModel>(uri, 0, 1, "HistoryTimeframeModel");
      qmlRegisterType<TopSitesModel>(uri, 0 , 1, "TopSitesModel");
      qmlRegisterType<HistoryDomainListModel>(uri, 0, 1, "HistoryDomainListModel");
 === modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
 --- tests/autopilot/webbrowser_app/emulators/browser.py	2015-09-29 10:59:50 +0000
 +++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-10-13 11:21:13 +0000
@@ -185,6 +185,18 @@
          else:
              return self.wait_select_single(ContextMenuMobile)
++    def open_item_context_menu_on_item(self, item, menuClass):
++        cx = item.globalRect.x + item.globalRect.width // 2
++        cy = item.globalRect.y + item.globalRect.height // 2
++        self.pointing_device.move(cx, cy)
++        if model() == 'Desktop':
++            self.pointing_device.click(button=3)
++        else:
++            self.pointing_device.press()
++            time.sleep(1.5)
++            self.pointing_device.release()
++        return self.wait_select_single(menuClass)
++
      def open_context_menu(self):
          webview = self.get_current_webview()
          chrome = self.chrome
@@ -519,7 +531,7 @@
          return self.select_single(UrlsList, objectName="bookmarksList")
      def get_top_sites_list(self):
--        return self.select_single(UrlsList, objectName="topSitesList")
++        return self.select_single(UrlPreviewGrid, objectName="topSitesList")
      def get_notopsites_label(self):
          return self.select_single(objectName="notopsites")
@@ -558,11 +570,7 @@
      def get_top_sites_list(self):
          self.go_to_section(0)
--        list = self.select_single(uitk.QQuickListView,
--                                  objectName="topSitesList")
--        return sorted(list.select_many("UrlDelegateWide",
--                      objectName="topSiteItem"),
--                      key=lambda delegate: delegate.globalRect.y)
++        return self.select_single(UrlPreviewGrid, objectName="topSitesList")
      def get_folders_list(self):
          self.go_to_section(1)
@@ -572,8 +580,7 @@
                        key=lambda delegate: delegate.globalRect.y)
      def get_top_site_items(self):
--        self.go_to_section(0)
--        return self.get_top_sites_list()
++        return self.get_top_sites_list().get_delegates()
      def get_bookmarks(self, folder_name):
          folders = self.get_folders_list()
@@ -597,6 +604,16 @@
          return [delegate.url for delegate in self.get_delegates()]
++class UrlPreviewGrid(uitk.UbuntuUIToolkitCustomProxyObjectBase):
++
++    def get_delegates(self):
++        return sorted(self.select_many("UrlPreviewDelegate"),
++                      key=lambda delegate: delegate.globalRect.y)
++
++    def get_urls(self):
++        return [delegate.url for delegate in self.get_delegates()]
++
++
  class UrlDelegate(uitk.UCListItem):
      pass
@@ -607,6 +624,22 @@
      pass
++class UrlPreviewDelegate(uitk.UbuntuUIToolkitCustomProxyObjectBase):
++
++    def hide_from_history(self, root):
++        menu = root.open_item_context_menu_on_item(self,
++                                                   "ActionSelectionPopover")
++
++        # Note: we can't still use the click_action_button method of
++        # ActionSelectionPopover's CPO, because it will crash if we delete the
++        # menu as a reaction to the click (which is the case here).
++        # However at least we can select the action button by objectName now.
++        # See bug http://pad.lv/1504189
++        delete_item = menu.wait_select_single(objectName="delete_button")
++        self.pointing_device.click_object(delete_item)
++        menu.wait_until_destroyed()
++
++
  class DraggableUrlDelegateWide(UrlDelegateWide):
      def get_grip(self):
 === modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
 --- tests/autopilot/webbrowser_app/tests/__init__.py	2015-09-03 09:46:29 +0000
 +++ tests/autopilot/webbrowser_app/tests/__init__.py	2015-10-13 11:21:13 +0000
@@ -82,17 +82,18 @@
          if not os.path.exists(self.cache_location):
              os.makedirs(self.cache_location)
--    def setUp(self):
++    def setUp(self, launch=True):
          self.create_temporary_profile()
          self.pointing_device = uitk.get_pointing_device()
          super(BrowserTestCaseBase, self).setUp()
--        self.app = self.launch_app()
++        if (launch):
++            self.launch_app()
      def launch_app(self):
          if os.path.exists(self.local_location):
--            return self.launch_test_local()
++            self.app = self.launch_test_local()
          else:
--            return self.launch_test_installed()
++            self.app = self.launch_test_installed()
          self.main_window.visible.wait_for(True)
      def launch_test_local(self):
@@ -238,7 +239,7 @@
      are executed, thus making them more robust.
      """
--    def setUp(self, path="/test1"):
++    def setUp(self, path="/test1", launch=True):
          self.http_server = http_server.HTTPServerInAThread()
          self.ping_server(self.http_server)
          self.addCleanup(self.http_server.cleanup)
@@ -249,7 +250,12 @@
          self.base_url = "http://" + self.base_domain
          self.url = self.base_url + path
          self.ARGS = self.ARGS + [self.url]
--        super(StartOpenRemotePageTestCaseBase, self).setUp()
++        super(StartOpenRemotePageTestCaseBase, self).setUp(launch)
++        if (launch):
++            self.assert_home_page_eventually_loaded()
++
++    def launch_and_wait_for_page_loaded(self):
++        self.launch_app()
          self.assert_home_page_eventually_loaded()
      def assert_home_page_eventually_loaded(self):
 === modified file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py'
 --- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2015-09-24 16:01:29 +0000
 +++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2015-10-13 11:21:13 +0000
@@ -406,9 +406,9 @@
                          Eventually(Equals(1)))
          notopsites_label = self.new_tab_view.get_notopsites_label()
          self.assertThat(notopsites_label.visible, Eventually(Equals(False)))
++
          delegate = top_sites.get_delegates()[0]
--        delegate.trigger_leading_action("leadingAction.delete",
--                                        delegate.wait_until_destroyed)
++        delegate.hide_from_history(self.main_window)
          self.assertThat(lambda: len(top_sites.get_delegates()),
                          Eventually(Equals(0)))
          self.assertThat(notopsites_label.visible, Eventually(Equals(True)))
@@ -443,11 +443,10 @@
      def test_remove_top_sites(self):
          view = self.new_tab_view
--        topsites = view.get_top_sites_list()
++        topsites = view.get_top_site_items()
          previous_count = len(topsites)
--        topsites[0].trigger_leading_action("leadingAction.delete",
--                                           topsites[0].wait_until_destroyed)
--        self.assertThat(len(view.get_top_sites_list()),
++        topsites[0].hide_from_history(self.main_window)
++        self.assertThat(len(view.get_top_site_items()),
                          Equals(previous_count - 1))
      def test_drag_bookmarks(self):
 === added file 'tests/autopilot/webbrowser_app/tests/test_site_previews.py'
 --- tests/autopilot/webbrowser_app/tests/test_site_previews.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/webbrowser_app/tests/test_site_previews.py	2015-10-13 11:21:13 +0000
@@ -0,0 +1,168 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright 2015 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/>.
++
++import hashlib
++import os
++from os import path as path
++import sqlite3
++import time
++
++from autopilot.matchers import Eventually
++from testtools.matchers import Not, Equals, DirExists, DirContains
++
++from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
++
++
++class TestSitePreviewsBase(StartOpenRemotePageTestCaseBase):
++
++    def setUp(self):
++        super(TestSitePreviewsBase, self).setUp(launch=False)
++        self.captures_dir = path.join(self.cache_location, "captures")
++
++    def file_in_dir(self, file, dir):
++        return path.exists(path.join(dir, file))
++
++    def capture_file(self, url):
++        return hashlib.md5(url.encode()).hexdigest() + ".jpg"
++
++
++class TestSitePreviewsNoLaunch(TestSitePreviewsBase):
++
++    def populate_captures_dir(self, capture_names):
++        # captures dir should not exist on fresh run
++        self.assertThat(self.captures_dir, Not(DirExists()))
++
++        # create some random files and ensure they get cleaned up
++        os.mkdir(self.captures_dir)
++        for capture_name in capture_names:
++            open(path.join(self.captures_dir, capture_name), 'w').close()
++        self.assertThat(self.captures_dir,
++                        DirContains(capture_names))
++
++    def populate_history(self):
++        self.countries = [
++            "Japan", "Russia", "France", "Italy", "Argentina",
++            "Canada", "Mexico", "Peru", "Congo", "Brazil",
++            "China", "Mali", "Morocco"
++        ]
++        db_path = os.path.join(self.data_location, "history.sqlite")
++        connection = sqlite3.connect(db_path)
++        connection.execute("""CREATE TABLE IF NOT EXISTS history
++                              (url VARCHAR, domain VARCHAR, title VARCHAR,
++                               icon VARCHAR, visits INTEGER,
++                               lastVisit DATETIME);""")
++        visits = 50
++        for country in self.countries:
++            timestamp = int(time.time())
++            query = "INSERT INTO history \
++                     VALUES ('{}', '{}', '{}', '', {}, {});"
++            query = query.format("http://en.wikipedia.org/wiki/" + country,
++                                 "wikipedia.org", country, visits, timestamp)
++            connection.execute(query)
++            visits -= 1
++        connection.commit()
++        connection.close()
++
++    def test_cleanup_previews_on_startup(self):
++        self.populate_history()
++
++        # populate the captures dir with correct thumbnail names for all
++        # the sites in history...
++        history = ["http://en.wikipedia.org/wiki/" + c for c in self.countries]
++        history = [self.capture_file(url) for url in history]
++
++        # ...plus some other files to verify possible corner cases
++        other_url = self.capture_file("http://google.com/")
++        not_hash = "not_a_preview.jpg"
++        not_image = "not_an_image.xxx"
++        self.populate_captures_dir(history + [other_url, not_hash, not_image])
++
++        self.launch_app()
++        time.sleep(0.5)  # wait for file system to settle
++
++        # verify that non-image files and top 10 sites are left alone,
++        # everything else is cleaned up
++        topsites = history[0:10]
++        self.assertThat(self.captures_dir, DirContains(topsites + [not_image]))
++
++
++class TestSitePreviews(TestSitePreviewsBase):
++
++    def setUp(self):
++        super(TestSitePreviews, self).setUp()
++        self.launch_and_wait_for_page_loaded()
++
++    def close_tab(self, index):
++        if self.main_window.wide:
++            self.main_window.chrome.get_tabs_bar().close_tab(index)
++        else:
++            tabs_view = self.open_tabs_view()
++            tabs_view.get_previews()[index].close()
++            toolbar = self.main_window.get_recent_view_toolbar()
++            toolbar.click_button("doneButton")
++
++    def get_captures(self):
++        if not path.exists(self.captures_dir):
++            return []
++
++        all = os.listdir(self.captures_dir)
++        cap = [f for f in all if path.isfile(path.join(self.captures_dir, f))]
++        return cap
++
++    def remove_top_site(self, new_tab_view, url):
++        top_sites = new_tab_view.get_top_site_items()
++        top_sites = [d for d in top_sites if d.url == url]
++        self.assertThat(len(top_sites), Equals(1))
++        delegate = top_sites[0]
++        delegate.hide_from_history(self.main_window)
++
++    def test_save_on_switch_tab_and_not_delete_if_topsite(self):
++        previous = self.main_window.get_current_webview().url
++
++        # switching away from tab should save a capture
++        self.open_new_tab(open_tabs_view=True)
++        self.assertThat(self.captures_dir,
++                        DirContains([self.capture_file(previous)]))
++
++        # closing the captured tab should not delete the capture since it is
++        # now part of the top sites (being the only one we opened so far)
++        self.close_tab(0)
++        time.sleep(0.5)  # wait for file system to settle
++        self.assertThat(self.captures_dir,
++                        DirContains([self.capture_file(previous)]))
++
++    def test_save_on_switch_tab_and_delete_if_not_topsite(self):
++        previous = self.main_window.get_current_webview().url
++        new_tab_view = self.open_new_tab(open_tabs_view=True)
++        self.remove_top_site(new_tab_view, previous)
++        self.close_tab(0)
++        self.assertThat(lambda: self.file_in_dir(self.capture_file(previous),
++                                                 self.captures_dir),
++                        Eventually(Equals(False)))
++
++    def test_delete_when_tab_closed_and_removed_from_topsites(self):
++        previous = self.main_window.get_current_webview().url
++        capture = self.capture_file(previous)
++        new_tab_view = self.open_new_tab(open_tabs_view=True)
++        self.close_tab(0)
++        time.sleep(0.5)  # wait for file system to settle
++        self.assertThat(self.captures_dir, DirContains([capture]))
++
++        if not self.main_window.wide:
++            new_tab_view = self.open_new_tab(open_tabs_view=True)
++        self.remove_top_site(new_tab_view, previous)
++        self.assertThat(lambda: self.file_in_dir(capture, self.captures_dir),
++                        Eventually(Equals(False)))
 === modified file 'tests/unittests/qml/tst_BrowserTab.qml'
 --- tests/unittests/qml/tst_BrowserTab.qml	2015-09-23 15:53:01 +0000
 +++ tests/unittests/qml/tst_BrowserTab.qml	2015-10-13 11:21:13 +0000
@@ -19,6 +19,7 @@
  import QtQuick 2.4
  import QtTest 1.0
  import "../../../src/app/webbrowser"
++import webbrowserapp.private 0.1
  Item {
      id: root
@@ -30,13 +31,16 @@
          id: tabComponent
          BrowserTab {
++            id: tab
++            anchors.fill: parent
              webviewComponent: Item {
++                anchors.fill: parent
                  property url url
                  property string title
                  property url icon
                  property var request
                  property string currentState
--
++                property bool incognito: tab.incognito
                  property int reloaded: 0
                  function reload() { reloaded++ }
+             }
@@ -44,10 +48,20 @@
+         }
+     }
++    SignalSpy {
++        id: previewSavedSpy
++        target: PreviewManager
++        signalName: "previewSaved"
++    }
++
      TestCase {
          name: "BrowserTab"
          when: windowShown
++        function init() {
++            previewSavedSpy.clear()
++        }
++
          function test_unique_ids() {
              var tab = tabComponent.createObject(root)
              var tab2 = tabComponent.createObject(root)
@@ -100,5 +114,54 @@
              compare(tab.webview.request, "foobar")
              tab.destroy()
+         }
++
++        function test_save_preview() {
++            var tab = tabComponent.createObject(root)
++            tab.initialUrl = "http://example.org"
++            tab.load()
++            tryCompare(tab, 'webviewPresent', true)
++
++            tab.current = true
++            tab.current = false
++            tryCompare(previewSavedSpy, "count", 1)
++            verify(!tab.visible)
++            compare(previewSavedSpy.signalArguments[0][0], tab.initialUrl)
++            compare(previewSavedSpy.signalArguments[0][1], Qt.resolvedUrl(PreviewManager.previewPathFromUrl(tab.initialUrl)))
++            compare(tab.preview, Qt.resolvedUrl(PreviewManager.previewPathFromUrl(tab.initialUrl)))
++            tab.destroy()
++        }
++
++        function test_no_save_preview_when_incognito() {
++            var tab = tabComponent.createObject(root)
++            tab.incognito = true
++            tab.initialUrl = "http://example.org"
++            tab.load()
++            tryCompare(tab, 'webviewPresent', true)
++
++            tab.current = true
++            tab.current = false
++            // this does not fully guarantee the event won't be emitted later,
++            // but it is a reasonable delay and certainly better than nothing
++            wait(250)
++            compare(previewSavedSpy.count, 0)
++            compare(tab.preview, "")
++            tab.destroy()
++        }
++
++        function test_delete_preview_on_close() {
++            var url = "http://example.org"
++            var path = Qt.resolvedUrl(PreviewManager.previewPathFromUrl(url))
++            var tab = tabComponent.createObject(root)
++            tab.initialUrl = url
++            tab.load()
++            tryCompare(tab, 'webviewPresent', true)
++
++            tab.current = true
++            tab.current = false
++            tryCompare(previewSavedSpy, "count", 1)
++            verify(FileOperations.exists(path))
++            tab.close()
++            verify(!FileOperations.exists(path))
++        }
+     }
+ }
 === modified file 'tests/unittests/qml/tst_HistoryViewWide.qml'
 --- tests/unittests/qml/tst_HistoryViewWide.qml	2015-09-18 15:20:09 +0000
 +++ tests/unittests/qml/tst_HistoryViewWide.qml	2015-10-13 11:21:13 +0000
@@ -21,6 +21,7 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Components.ListItems 1.3 as ListItems
  import Ubuntu.Test 1.0
++import webbrowserapp.private 0.1
  import webbrowsertest.private 0.1
  import "../../../src/app/webbrowser"
@@ -45,9 +46,6 @@
          focus: true
          sourceComponent: HistoryViewWide {
              focus: true
--            historyModel: HistoryModelMock {
--                databasePath: ":memory:"
--            }
+         }
+     }
@@ -90,19 +88,25 @@
              mouseRelease(item, center.x + 100, center.y, Qt.LeftButton, Qt.NoModifier, 2000)
+         }
++        function initTestCase() {
++            HistoryModel.databasePath = ":memory:"
++        }
++
          function init() {
              historyViewWideLoader.active = true
              waitForRendering(historyViewWideLoader.item)
              for (var i = 0; i < 3; ++i) {
--                historyViewWide.historyModel.add("http://example.org/" + i, "Example Domain " + i, "")
++                HistoryModel.add("http://example.org/" + i, "Example Domain " + i, "")
+             }
++            historyViewWide.loadModel()
              var urlsList = findChild(historyViewWide, "urlsListView")
              waitForRendering(urlsList)
              tryCompare(urlsList, "count", 3)
+         }
          function cleanup() {
++            HistoryModel.clearAll()
              historyViewWideLoader.active = false
              ctrlFCaptured = 0
+         }
@@ -205,7 +209,9 @@
          function test_keyboard_navigation_between_lists() {
              var lastVisitDateList = findChild(historyViewWide, "lastVisitDateListView")
              var urlsList = findChild(historyViewWide, "urlsListView")
++            verify(!lastVisitDateList.activeFocus)
              verify(urlsList.activeFocus)
++
              keyClick(Qt.Key_Left)
              verify(lastVisitDateList.activeFocus)
              verify(!urlsList.activeFocus)
@@ -309,7 +315,7 @@
              keyClick(Qt.Key_Enter)
              compare(historyEntryClickedSpy.count, 1)
              var args = historyEntryClickedSpy.signalArguments[0]
--            var entry = urlsList.model.get(2)
++            var entry = urlsList.model.get(0)
              compare(String(args[0]), String(entry.url))
              // now try the same during a search
@@ -372,7 +378,7 @@
              var today = new Date()
              today = new Date(today.getFullYear(), today.getMonth(), today.getDate())
              var youngest = new Date(1912, 6, 23)
--            var model = historyViewWide.historyModel
++            var model = HistoryModel
              model.addByDate("https://en.wikipedia.org/wiki/Alan_Turing", "Alan Turing", youngest)
              model.addByDate("https://en.wikipedia.org/wiki/Alonzo_Church", "Alonzo Church", new Date(1903, 6, 14))
 === modified file 'tests/unittests/qml/tst_NewTabViewWide.qml'
 --- tests/unittests/qml/tst_NewTabViewWide.qml	2015-08-11 14:28:29 +0000
 +++ tests/unittests/qml/tst_NewTabViewWide.qml	2015-10-13 11:21:13 +0000
@@ -29,13 +29,6 @@
      height: 600
      Component {
--        id: historyModel
--        HistoryModel {
--            databasePath: ":memory:"
--        }
--    }
--
--    Component {
          id: bookmarksModel
          BookmarksModel {
              databasePath: ":memory:"
@@ -44,7 +37,6 @@
      property NewTabViewWide view
      property var bookmarks
--    property var history
      property string homepage: "http://example.com/homepage"
      Component {
@@ -56,7 +48,6 @@
                  property int newTabDefaultSection: 0
+             }
              bookmarksModel: bookmarks
--            historyModel: history
+         }
+     }
@@ -84,9 +75,12 @@
          name: "NewTabViewWide"
          when: windowShown
++        function initTestCase() {
++            HistoryModel.databasePath = ":memory:"
++        }
++
          function init() {
              bookmarks = bookmarksModel.createObject()
--            history = historyModel.createObject()
              view = viewComponent.createObject(root)
              populate()
@@ -103,9 +97,9 @@
+         }
          function populate() {
--            history.add("http://example.com", "Example Com", "")
--            history.add("http://example.org", "Example Org", "")
--            history.add("http://example.net", "Example Net", "")
++            HistoryModel.add("http://example.com", "Example Com", "")
++            HistoryModel.add("http://example.org", "Example Org", "")
++            HistoryModel.add("http://example.net", "Example Net", "")
              bookmarks.add("http://example.com", "Example Com", "", "")
              bookmarks.add("http://example.org/bar", "Example Org Bar", "", "Folder B")
              bookmarks.add("http://example.org/foo", "Example Org Foo", "", "Folder B")
@@ -114,8 +108,7 @@
+         }
          function cleanup() {
--            history.destroy()
--            history = null
++            HistoryModel.clearAll()
              bookmarks.destroy()
              bookmarks = null
@@ -155,7 +148,7 @@
          function test_topsites_list() {
              // add 8 more top sites so that we are beyond the limit of 10
              for (var i = 0; i < 8; i++) {
--                history.add("http://example.com/" + i, "Example Com " + i, "")
++                HistoryModel.add("http://example.com/" + i, "Example Com " + i, "")
+             }
              var items = getListItems("topSitesList", "topSiteItem")
@@ -208,22 +201,24 @@
          function test_navigate_topsites_by_keyboard() {
              var items = getListItems("topSitesList", "topSiteItem")
--            findChild(view, "topSitesList").currentIndex = 0
--            verify(items[0].highlighted)
--            keyClick(Qt.Key_Down)
--            verify(!items[0].highlighted)
--            verify(items[1].highlighted)
--            keyClick(Qt.Key_Down)
--            verify(items[2].highlighted)
--            keyClick(Qt.Key_Down) // ensure no scrolling past bottom boundary
--            verify(items[2].highlighted)
--            keyClick(Qt.Key_Up)
--            verify(items[1].highlighted)
--            keyClick(Qt.Key_Up)
--            verify(items[0].highlighted)
--            keyClick(Qt.Key_Up)
--            verify(items[0].highlighted)
++            var list = findChild(view, "topSitesList")
++            list.currentIndex = 0
++            keyClick(Qt.Key_Right)
++            compare(list.currentIndex, 1)
++            keyClick(Qt.Key_Right)
++            compare(list.currentIndex, 2)
++            keyClick(Qt.Key_Right) // ensure list does not wrap around
++            compare(list.currentIndex, 2)
++            keyClick(Qt.Key_Left)
++            compare(list.currentIndex, 1)
++            keyClick(Qt.Key_Left)
++            compare(list.currentIndex, 0)
++            keyClick(Qt.Key_Up)
++            compare(list.currentIndex, 0)
              compare(releasingKeyboardFocusSpy.count, 1)
++            keyClick(Qt.Key_Left)
++            compare(list.currentIndex, 0)
++            compare(releasingKeyboardFocusSpy.count, 2)
+         }
          function test_activate_topsites_by_keyboard() {
@@ -231,7 +226,7 @@
              keyClick(Qt.Key_Return)
              compare(historyEntryClickedSpy.count, 1)
              compare(historyEntryClickedSpy.signalArguments[0][0], "http://example.com")
--            keyClick(Qt.Key_Down)
++            keyClick(Qt.Key_Right)
              keyClick(Qt.Key_Return)
              compare(historyEntryClickedSpy.count, 2)
              compare(historyEntryClickedSpy.signalArguments[1][0], "http://example.org")
 === added file 'tests/unittests/qml/tst_PreviewManager.qml'
 --- tests/unittests/qml/tst_PreviewManager.qml	1970-01-01 00:00:00 +0000
 +++ tests/unittests/qml/tst_PreviewManager.qml	2015-10-13 11:21:13 +0000
@@ -0,0 +1,117 @@
++/*
++ * Copyright 2015 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 QtTest 1.0
++import Ubuntu.Test 1.0
++import "../../../src/app/webbrowser"
++import webbrowserapp.private 0.1
++import webbrowsertest.private 0.1
++
++Item {
++    id: root
++
++    width: 800
++    height: 600
++
++    SignalSpy {
++        id: previewSavedSpy
++        target: PreviewManager
++        signalName: "previewSaved"
++    }
++
++    QtObject {
++        id: grabResultMock
++        function saveToFile(path) {
++            TestContext.createFile(path);
++            return true
++        }
++    }
++
++    QtObject {
++        id: grabResultFailMock
++        function saveToFile(path) { return false }
++    }
++
++    UbuntuTestCase {
++        name: "PreviewManager"
++        when: windowShown
++
++        property string baseUrl: "http://example.com/"
++
++        function initTestCase() {
++            HistoryModel.databasePath = ":memory:"
++        }
++
++        function init() {
++            previewSavedSpy.clear()
++            verify(TestContext.removeDirectory(PreviewManager.capturesDir))
++        }
++
++        function populate(count, createPreviewFiles) {
++            for (var i = 0; i < 11; i++) {
++                var url = baseUrl + i
++                HistoryModel.add(url, "Example Com" + i, "")
++                if (createPreviewFiles) {
++                    var path = PreviewManager.previewPathFromUrl(url)
++                    TestContext.createFile(path)
++                }
++            }
++        }
++
++        function cleanup() {
++            HistoryModel.clearAll()
++        }
++
++        function test_topsites_not_deleted() {
++            populate(11, true)
++            for (var i = 0; i < 11; i++) {
++                var url = baseUrl + i
++                PreviewManager.checkDelete(url)
++                var path = Qt.resolvedUrl(PreviewManager.previewPathFromUrl(url))
++
++                // verify that only the item that is outside of the top 10 list
++                // gets deleted
++                if (i < 10) verify(FileOperations.exists(path))
++                else verify(!FileOperations.exists(path))
++            }
++        }
++
++        function test_save_preview() {
++            var file = Qt.resolvedUrl(PreviewManager.previewPathFromUrl(baseUrl))
++
++            PreviewManager.saveToDisk(grabResultMock, baseUrl)
++            verify(FileOperations.exists(file))
++            compare(previewSavedSpy.count, 1)
++            compare(previewSavedSpy.signalArguments[0][0], baseUrl)
++            compare(previewSavedSpy.signalArguments[0][1], file)
++        }
++
++        function test_save_preview_fail() {
++            var path = PreviewManager.previewPathFromUrl(baseUrl)
++            var file = Qt.resolvedUrl(path)
++
++            ignoreWarning("Failed to save preview to disk for %1 (path is %2)".arg(baseUrl).arg(path))
++            PreviewManager.saveToDisk(grabResultFailMock, baseUrl)
++            verify(!FileOperations.exists(file))
++            compare(previewSavedSpy.count, 1)
++            compare(previewSavedSpy.signalArguments[0][0], baseUrl)
++            compare(previewSavedSpy.signalArguments[0][1], "")
++        }
++    }
++}
 === modified file 'tests/unittests/qml/tst_QmlTests.cpp'
 --- tests/unittests/qml/tst_QmlTests.cpp	2015-09-16 17:19:17 +0000
 +++ tests/unittests/qml/tst_QmlTests.cpp	2015-10-13 11:21:13 +0000
@@ -105,6 +105,22 @@
          return QFile(QDir(path).absoluteFilePath(QString("%1.xml").arg(filename))).remove();
+     }
++    Q_INVOKABLE bool createFile(const QString& filePath) {
++        // create all the directories necessary for the file to be created
++        QFileInfo fileInfo(filePath);
++        if (!QFileInfo::exists(fileInfo.path())) {
++          QDir::root().mkpath(fileInfo.path());
++        }
++
++        QFile file(fileInfo.absoluteFilePath());
++        return file.open(QIODevice::WriteOnly | QIODevice::Text);
++    }
++
++    Q_INVOKABLE bool removeDirectory(const QString& path) {
++        QDir dir(path);
++        return dir.removeRecursively();
++    }
++
  private:
      QTemporaryDir m_testDir1;
      QTemporaryDir m_testDir2;
@@ -152,6 +168,13 @@
      return new TestContext();
+ }
++static QObject* HistoryModel_singleton_factory(QQmlEngine* engine, QJSEngine* scriptEngine)
++{
++    Q_UNUSED(engine);
++    Q_UNUSED(scriptEngine);
++    return new HistoryModelMock();
++}
++
  int main(int argc, char** argv)
+ {
      const char* commonUri = "webbrowsercommon.private";
@@ -162,7 +185,7 @@
      qmlRegisterType<TabsModel>(browserUri, 0, 1, "TabsModel");
      qmlRegisterType<BookmarksModel>(browserUri, 0, 1, "BookmarksModel");
      qmlRegisterType<BookmarksFolderListModel>(browserUri, 0, 1, "BookmarksFolderListModel");
--    qmlRegisterType<HistoryModel>(browserUri, 0, 1, "HistoryModel");
++    qmlRegisterSingletonType<HistoryModel>(browserUri, 0, 1, "HistoryModel", HistoryModel_singleton_factory);
      qmlRegisterType<HistoryTimeframeModel>(browserUri, 0, 1, "HistoryTimeframeModel");
      qmlRegisterType<HistoryLastVisitDateListModel>(browserUri, 0, 1, "HistoryLastVisitDateListModel");
      qmlRegisterType<HistoryLastVisitDateModel>(browserUri, 0, 1, "HistoryLastVisitDateModel");
@@ -173,7 +196,6 @@
      const char* testUri = "webbrowsertest.private";
      qmlRegisterSingletonType<TestContext>(testUri, 0, 1, "TestContext", TestContext_singleton_factory);
--    qmlRegisterType<HistoryModelMock>(testUri, 0, 1, "HistoryModelMock");
      return quick_test_main(argc, argv, "QmlTests", nullptr);
+ }