Merge lp:~osomon/webbrowser-app/newTabRefactoring-autopilot-tests into lp:webbrowser-app

[Olivier Tilloy]

Remove the upstreamcomponents folder, and use components from the UITK instead.
Add autopilot tests for the new tab view.

[Riccardo Padovani (rpadovani)]

Since LP Web UI doesn't work for MR I'm doing this review by mail,
and I'll take more time to check the diff later.

It seems to work well, autopilot tests work good, there aren't flake8 issues
and the code seems ok.

Great work Olivier :-)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:910
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1835/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3006/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/592/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/592/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/592/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3004/console

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

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

Some things:

- onHistoryDomainRemoved: browser.historyModel.removeEntriesByDomain(domain)

Why do you remove the possibilty to delete an entire domain? Anyway, if you are sure about this, you should also remove the swype - atm you can swype the domain, but then when you click on the trash icon nothing happens.

In the ExpandedHistoryView there isn't anymore the multiple selection - I think we should be consistent and have it (or don't have it) both in ExpandedHistoryView and HistoryView

review: Needs Fixing

[lp:~osomon/webbrowser-app/newTabRefactoring-autopilot-tests]

911. By Olivier Tilloy on 2015-05-29

Fix embarassing regression…

[Olivier Tilloy (osomon)]

> Some things:
>
> - onHistoryDomainRemoved:
> browser.historyModel.removeEntriesByDomain(domain)
>
> Why do you remove the possibilty to delete an entire domain? Anyway, if you
> are sure about this, you should also remove the swype - atm you can swype the
> domain, but then when you click on the trash icon nothing happens.

Good catch! This is something I overlooked, I just pushed a new revision that fixes it.

> In the ExpandedHistoryView there isn't anymore the multiple selection - I
> think we should be consistent and have it (or don't have it) both in
> ExpandedHistoryView and HistoryView

We never had multiple selection in the expanded history view, so this is not a regression. If you think we should have it, feel free to file a bug against webbrowser-app and ubuntu-ux to have design comment on the idea.

[Riccardo Padovani (rpadovani)]

Looks good now then, thanks :-)

I opened bug #1459982 about multiple selection in history view

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:911
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1838/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3013/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/595/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/595/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/595/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3011/console

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/newTabRefactoring-autopilot-tests]

912. By Olivier Tilloy on 2015-06-01

Also emit countChanged() when the model has been reset.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:912
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1844/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3038/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/601/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/601/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/601/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3036/console

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/newTabRefactoring-autopilot-tests]

913. By Olivier Tilloy on 2015-06-02

Fix invalid indices in for loop.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:913
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1845/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3045/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/602/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/602/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/602/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3043/console

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/newTabRefactoring-autopilot-tests]

914. By Olivier Tilloy on 2015-06-02

When in multiple selection mode, clicking a domain (de)selects it instead of expanding it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:914
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1846/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3047/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/603/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/603/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/603/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3045/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-06-02 14:24:15 +0000
+++ src/app/webbrowser/Browser.qml	2015-06-02 14:24:15 +0000
@@ -221,6 +221,7 @@
                 NewTabView {
                     historyModel: browser.historyModel
                     bookmarksModel: browser.bookmarksModel
+                    settingsObject: settings
                     onBookmarkClicked: {
                         chrome.requestedUrl = url
                         currentWebview.url = url
@@ -624,7 +625,6 @@
                     var view = expandedHistoryViewComponent.createObject(historyViewContainer, {model: model})
                     view.onHistoryEntryClicked.connect(destroy)
                 }
-                onHistoryDomainRemoved: browser.historyModel.removeEntriesByDomain(domain)
                 onDone: destroy()
             }
         }
@@ -639,7 +639,12 @@
                     browser.openUrlInNewTab(url, true)
                     done()
                 }
-                onHistoryEntryRemoved: browser.historyModel.removeEntryByUrl(url)
+                onHistoryEntryRemoved: {
+                    if (count == 1) {
+                        done()
+                    }
+                    browser.historyModel.removeEntryByUrl(url)
+                }
                 onDone: destroy()
             }
         }
 
=== modified file 'src/app/webbrowser/CMakeLists.txt'
--- src/app/webbrowser/CMakeLists.txt	2015-04-28 23:22:57 +0000
+++ src/app/webbrowser/CMakeLists.txt	2015-06-02 14:24:15 +0000
@@ -50,10 +50,6 @@
         DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webbrowser
         FILES_MATCHING PATTERN *.png)
 
-install(DIRECTORY upstreamcomponents
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webbrowser
-        FILES_MATCHING PATTERN *.qml)
-
 install(DIRECTORY searchengines
         DESTINATION ${CMAKE_INSTALL_DATADIR}/webbrowser-app/webbrowser
         FILES_MATCHING PATTERN *.xml)
 
=== modified file 'src/app/webbrowser/ExpandedHistoryView.qml'
--- src/app/webbrowser/ExpandedHistoryView.qml	2015-03-20 12:19:51 +0000
+++ src/app/webbrowser/ExpandedHistoryView.qml	2015-06-02 14:24:15 +0000
@@ -24,6 +24,7 @@
     id: expandedHistoryView
 
     property alias model: entriesListView.model
+    property alias count: entriesListView.count
 
     signal historyEntryClicked(url url)
     signal historyEntryRemoved(url url)
@@ -37,19 +38,22 @@
     ListView {
         id: entriesListView
 
-        property var _currentSwipedItem: null
-
         anchors {
             top: header.bottom
             bottom: parent.bottom
             left: parent.left
             right: parent.right
-            margins: units.gu(2)
+            margins: units.gu(1.5)
+            leftMargin: 0
         }
 
         section.property: "lastVisitDate"
         section.delegate: HistorySectionDelegate {
-            width: parent.width
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(1.5)
+                right: parent.right
+            }
         }
 
         delegate: UrlDelegate {
@@ -61,91 +65,12 @@
             title: model.title
             icon: model.icon
 
-            property var removalAnimation
-            function remove() {
-                removalAnimation.start()
-            }
-
-            onSwippingChanged: {
-                entriesListView._updateSwipeState(entriesDelegate)
-            }
-
-            onSwipeStateChanged: {
-                entriesListView._updateSwipeState(entriesDelegate)
-            }
-
-            leftSideAction: Action {
-                iconName: "delete"
-                text: i18n.tr("Delete")
-                onTriggered: {
-                    entriesDelegate.remove()
-                }
-            }
-
-            ListView.onRemove: ScriptAction {
-                script: {
-                    if (entriesListView._currentSwipedItem === entriesDelegate) {
-                        entriesListView._currentSwipedItem = null
-                    }
-                }
-            }
-
-            removalAnimation: SequentialAnimation {
-                alwaysRunToEnd: true
-
-                PropertyAction {
-                    target: entriesDelegate
-                    property: "ListView.delayRemove"
-                    value: true
-                }
-
-                UbuntuNumberAnimation {
-                    target: entriesDelegate
-                    property: "height"
-                    to: 0
-                }
-
-                PropertyAction {
-                    target: entriesDelegate
-                    property: "ListView.delayRemove"
-                    value: false
-                }
-
-                ScriptAction {
-                    script: {
-                        if(entriesListView.count === 1) {
-                            expandedHistoryView.done()
-                        }
-                        historyEntryRemoved(model.url)
-                    }
-                }
-            }
-
-            onItemClicked: {
-                historyEntryClicked(model.url)
-            }
-        }
-
-        function _updateSwipeState(item) {
-            if (item.swipping) {
-                return
-            }
-
-            if (item.swipeState !== "Normal") {
-                if (entriesListView._currentSwipedItem !== item) {
-                    if (entriesListView._currentSwipedItem) {
-                        entriesListView._currentSwipedItem.resetSwipe()
-                    }
-                    entriesListView._currentSwipedItem = item
-                }
-            } else if (item.swipeState !== "Normal"
-            && entriesListView._currentSwipedItem === item) {
-                entriesListView._currentSwipedItem = null
-            }
+            onClicked: expandedHistoryView.historyEntryClicked(model.url)
+            onRemoved: expandedHistoryView.historyEntryRemoved(model.url)
         }
     }
 
-    Rectangle {
+    Item {
         id: header
 
         anchors {
@@ -155,8 +80,6 @@
         }
         height: units.gu(8)
 
-        color: "#f6f6f6"
-
         Rectangle {
             anchors {
                 left: parent.left
@@ -178,6 +101,7 @@
             icon: expandedHistoryView.model.lastVisitedIcon
             title: expandedHistoryView.model.domain
             url: i18n.tr("%1 page", "%1 pages", entriesListView.count).arg(entriesListView.count)
+            enabled: false
         }
 
         Button {
 
=== modified file 'src/app/webbrowser/HistoryView.qml'
--- src/app/webbrowser/HistoryView.qml	2015-03-20 12:19:51 +0000
+++ src/app/webbrowser/HistoryView.qml	2015-06-02 14:24:15 +0000
@@ -17,9 +17,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import webbrowserapp.private 0.1
-import "upstreamcomponents"
 
 Item {
     id: historyView
@@ -27,7 +26,6 @@
     property alias historyModel: historyTimeframeModel.sourceModel
 
     signal seeMoreEntriesClicked(var model)
-    signal historyDomainRemoved(var domain)
     signal done()
 
     Rectangle {
@@ -35,37 +33,18 @@
         color: "#f6f6f6"
     }
 
-    UbuntuNumberAnimation {
-        id: topBarOpenAnimation
-        target: topBar
-        property: "height"
-        to: units.gu(5)
-        alwaysRunToEnd: true
-    }
-
-    UbuntuNumberAnimation {
-        id: topBarCloseAnimation
-        target: topBar
-        property: "height"
-        to: 0
-        alwaysRunToEnd: true
-    }
-
-    MultipleSelectionListView {
+    ListView {
         id: domainsListView
 
-        property var _currentSwipedItem: null
-
         anchors {
             top: topBar.bottom
             left: parent.left
             right: parent.right
             bottom: toolbar.top
-            topMargin: units.gu(-0.5) // topMargin 2 - firstSection.topMargin 2.5
             rightMargin: units.gu(2)
         }
 
-        listModel: HistoryDomainListChronologicalModel {
+        model: HistoryDomainListChronologicalModel {
             sourceModel: HistoryDomainListModel {
                 sourceModel: HistoryTimeframeModel {
                     id: historyTimeframeModel
@@ -80,17 +59,7 @@
             anchors.leftMargin: units.gu(2)
         }
 
-        onSelectionDone: {
-            var domains = new Array();
-            for (var i=0; i < items.count; i++) {
-                domains[i] = items.get(i).model.domain
-            }
-            for (var i=0; i < domains.length; i++) {
-                historyView.historyDomainRemoved(domains[i])
-            }
-        }
-
-        listDelegate: UrlDelegate {
+        delegate: UrlDelegate {
             id: urlDelegate
             width: parent.width
             height: units.gu(5)
@@ -99,111 +68,19 @@
             url: lastVisitedTitle
             icon: model.lastVisitedIcon
 
-            property var removalAnimation
-            function remove() {
-                removalAnimation.start()
-            }
-
-            anchors {
-                left: parent.left
-                // we need to move left the favicon to align the favicon to
-                // other elements. Favicon has a container bigger than it.
-                // units.gu(3) it's the size of the favicon container
-                // units.dp(16) it's the size of the favicon
-                // the favicon is hCentered in the container
-                leftMargin: selectionMode ? - (units.gu(3) - units.dp(16)) / 2 : 0
-            }
-
-            selectionMode: domainsListView.isInSelectionMode
-            selected: domainsListView.isSelected(urlDelegate)
-
-            onSwippingChanged: {
-                domainsListView._updateSwipeState(urlDelegate)
-            }
-
-            onSwipeStateChanged: {
-                domainsListView._updateSwipeState(urlDelegate)
-            }
-
-            leftSideAction: Action {
-                iconName: "delete"
-                text: i18n.tr("Delete")
-                onTriggered: {
-                    urlDelegate.remove()
-                }
-            }
-
-            ListView.onRemove: ScriptAction {
-                script: {
-                    if (domainsListView._currentSwipedItem === urlDelegate) {
-                        domainsListView._currentSwipedItem = null
-                    }
-                }
-            }
-
-            removalAnimation: SequentialAnimation {
-                alwaysRunToEnd: true
-
-                PropertyAction {
-                    target: urlDelegate
-                    property: "ListView.delayRemove"
-                    value: true
-                }
-
-                UbuntuNumberAnimation {
-                    target: urlDelegate
-                    property: "height"
-                    to: 0
-                }
-
-                PropertyAction {
-                    target: urlDelegate
-                    property: "ListView.delayRemove"
-                    value: false
-                }
-
-                ScriptAction {
-                    script: {
-                        historyView.historyDomainRemoved(model.domain)
-                    }
-                }
-            }
-
-            onItemClicked: {
-                if (domainsListView.isInSelectionMode) {
-                    if (!domainsListView.selectItem(urlDelegate)) {
-                        domainsListView.deselectItem(urlDelegate)
-                    }
-                }
-                else {
+            onClicked: {
+                if (selectMode) {
+                    selected = !selected
+                } else {
                     historyView.seeMoreEntriesClicked(model.entries)
                 }
             }
-            onItemPressAndHold: {
-                domainsListView.startSelection()
-                domainsListView.selectItem(urlDelegate)
-            }
-        }
-
-        /*
-         * Functions for manage swype and multiple selection together
-         * Developed upstream
-         */
-        function _updateSwipeState(item) {
-            if (item.swipping) {
-                return
-            }
-
-            if (item.swipeState !== "Normal") {
-                if (domainsListView._currentSwipedItem !== item) {
-                    if (domainsListView._currentSwipedItem) {
-                        domainsListView._currentSwipedItem.resetSwipe()
-                    }
-                    domainsListView._currentSwipedItem = item
+            onRemoved: historyView.historyModel.removeEntriesByDomain(model.domain)
+            onPressAndHold: {
+                selectMode = !selectMode
+                if (selectMode) {
+                    domainsListView.ViewItems.selectedIndices = [index]
                 }
-            } else if (item.swipeState !== "Normal"
-            && domainsListView._currentSwipedItem === item) {
-                domainsListView._currentSwipedItem = null
             }
         }
     }
@@ -253,11 +130,19 @@
 
     Item {
         id: topBar
-        visible: domainsListView.isInSelectionMode
-
-        onVisibleChanged: visible ? topBarOpenAnimation.start() : topBarCloseAnimation.start()
-
-        anchors { left: parent.left; right: parent.right; top: parent.top }
+
+        visible: domainsListView.ViewItems.selectMode
+        height: visible ? units.gu(5) : 0
+
+        Behavior on height {
+            UbuntuNumberAnimation {}
+        }
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
 
         Rectangle {
             width: parent.width
@@ -281,7 +166,7 @@
 
                 MouseArea {
                     anchors.fill: parent
-                    onClicked: domainsListView.cancelSelection()
+                    onClicked: domainsListView.ViewItems.selectMode = false
                 }
 
                 anchors.left: parent.left
@@ -297,10 +182,14 @@
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
-                        if (domainsListView.selectedItems.count === domainsListView.count) {
-                            domainsListView.clearSelection()
+                        if (domainsListView.ViewItems.selectedIndices.length === domainsListView.count) {
+                            domainsListView.ViewItems.selectedIndices = []
                         } else {
-                            domainsListView.selectAll()
+                            var indices = []
+                            for (var i = 0; i < domainsListView.count; ++i) {
+                                indices.push(i)
+                            }
+                            domainsListView.ViewItems.selectedIndices = indices
                         }
                     }
                 }
@@ -319,11 +208,21 @@
 
                 iconName: "delete"
                 text: i18n.tr("Delete")
-                enabled: domainsListView.selectedItems.count > 0
+                enabled: domainsListView.ViewItems.selectedIndices.length > 0
 
                 MouseArea {
                     anchors.fill: parent
-                    onClicked: domainsListView.endSelection()
+                    onClicked: {
+                        var indices = domainsListView.ViewItems.selectedIndices
+                        var domains = []
+                        for (var i in indices) {
+                            domains.push(domainsListView.model.get(indices[i]))
+                        }
+                        domainsListView.ViewItems.selectMode = false
+                        for (var j in domains) {
+                            historyModel.removeEntriesByDomain(domains[j])
+                        }
+                    }
                 }
 
                 anchors.right: parent.right
 
=== modified file 'src/app/webbrowser/NewTabView.qml'
--- src/app/webbrowser/NewTabView.qml	2015-06-02 14:24:15 +0000
+++ src/app/webbrowser/NewTabView.qml	2015-06-02 14:24:15 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Qt.labs.settings 1.0
+import Ubuntu.Components 1.2
 import webbrowserapp.private 0.1
 import ".."
 
@@ -27,6 +27,7 @@
 
     property QtObject bookmarksModel
     property alias historyModel: historyTimeframeModel.sourceModel
+    property Settings settingsObject
 
     signal bookmarkClicked(url url)
     signal bookmarkRemoved(url url)
@@ -45,7 +46,6 @@
         property bool seeMoreBookmarksView: bookmarksCountLimit > 4
         property int bookmarksCountLimit: Math.min(4, numberOfBookmarks)
         property int numberOfBookmarks: bookmarksModel ? bookmarksModel.count : 0
-        property int numberOfTopSites: historyModel ? historyModel.count : 0
 
         // Force the topsites section to reappear when remove a bookmark while
         // the bookmarks list is expanded and there aren't anymore > 5
@@ -72,7 +72,6 @@
             id: contentColumn
             anchors {
                 left: parent.left
-                leftMargin: units.gu(1.5)
                 right: parent.right
                 rightMargin: units.gu(1.5)
             }
@@ -80,7 +79,11 @@
 
             Row {
                 height: units.gu(6)
-                anchors { left: parent.left; right: parent.right }
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(1.5)
+                    right: parent.right
+                }
                 spacing: units.gu(1.5)
 
                 Icon {
@@ -108,6 +111,7 @@
 
                 Button {
                     id: moreButton
+                    objectName: "bookmarks.moreButton"
                     height: parent.height - units.gu(2)
 
                     anchors { top: parent.top; topMargin: units.gu(1) }
@@ -129,7 +133,11 @@
 
             Rectangle {
                 height: units.gu(0.1)
-                anchors { left: parent.left; right: parent.right }
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(1.5)
+                    right: parent.right
+                }
                 color: "#d3d3d3"
             }
 
@@ -137,7 +145,6 @@
                 id: bookmarksColumn
                 anchors {
                     left: parent.left
-                    leftMargin: units.gu(-1.5)
                     right: parent.right
                 }
 
@@ -147,7 +154,7 @@
                 spacing: 0
 
                 UrlDelegate {
-                    id: homepageBookmark
+                    objectName: "homepageBookmark"
                     anchors {
                         left: parent.left
                         right: parent.right
@@ -156,12 +163,14 @@
 
                     title: i18n.tr('Homepage')
 
-                    url: settings.homepage
-                    onItemClicked: newTabView.bookmarkClicked(url)
+                    leadingActions: null
+
+                    url: newTabView.settingsObject.homepage
+                    onClicked: newTabView.bookmarkClicked(url)
                 }
 
                 UrlsList {
-                    id: bookmarksList
+                    objectName: "bookmarksList"
                     anchors {
                         left: parent.left
                         right: parent.right
@@ -177,13 +186,13 @@
                 }
             }
 
-            Rectangle {
+            Item {
                 height: units.gu(6)
                 anchors {
                     left: parent.left
+                    leftMargin: units.gu(1.5)
                     right: parent.right
                 }
-                color: "#f6f6f6"
 
                 Label {
                     anchors {
@@ -203,7 +212,11 @@
 
             Rectangle {
                 height: units.gu(0.1)
-                anchors { left: parent.left; right: parent.right }
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(1.5)
+                    right: parent.right
+                }
                 color: "#d3d3d3"
 
                 opacity: internal.seeMoreBookmarksView ? 0.0 : 1.0
@@ -211,12 +224,14 @@
             }
 
             Label {
+                objectName: "notopsites"
+
                 height: units.gu(11)
                 anchors {
                     left: parent.left
                     right: parent.right
                 }
-                visible: internal.numberOfTopSites === 0
+                visible: topSitesModel.count == 0
 
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
@@ -226,14 +241,15 @@
             }
 
             UrlsList {
+                objectName: "topSitesList"
                 anchors {
                     left: parent.left
-                    leftMargin: units.gu(-1.5)
                     right: parent.right
                 }
 
                 opacity: internal.seeMoreBookmarksView ? 0.0 : 1.0
                 Behavior on opacity { UbuntuNumberAnimation {} }
+                visible: opacity > 0
 
                 limit: 10
                 spacing: 0
 
=== modified file 'src/app/webbrowser/UrlDelegate.qml'
--- src/app/webbrowser/UrlDelegate.qml	2015-03-20 12:19:51 +0000
+++ src/app/webbrowser/UrlDelegate.qml	2015-06-02 14:24:15 +0000
@@ -17,20 +17,26 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.2
 import ".."
-import "upstreamcomponents"
 
-ListItemWithActions {
+ListItem {
     id: urlDelegate
 
     property alias icon: icon.source
     property alias title: title.text
     property alias url: url.text
-    color: "#f6f6f6"
+
+    divider.visible: false
+
+    signal removed()
 
     Row {
-        anchors.verticalCenter: parent.verticalCenter
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            leftMargin: units.gu(1.5)
+        }
         spacing: units.gu(1)
 
         UbuntuShape {
@@ -69,4 +75,14 @@
             }
         }
     }
+
+    leadingActions: ListItemActions {
+        actions: [
+            Action {
+                objectName: "leadingAction.delete"
+                iconName: "delete"
+                onTriggered: urlDelegate.removed()
+            }
+        ]
+    }
 }
 
=== modified file 'src/app/webbrowser/UrlsList.qml'
--- src/app/webbrowser/UrlsList.qml	2015-06-02 14:24:15 +0000
+++ src/app/webbrowser/UrlsList.qml	2015-06-02 14:24:15 +0000
@@ -21,6 +21,7 @@
 
 Column {
     id: urlsList
+
     property alias model: urlsListRepeater.model
     property int limit
 
@@ -29,102 +30,22 @@
 
     spacing: units.gu(1)
 
-    move: Transition { UbuntuNumberAnimation { properties: "x, y" } }
-
     Repeater {
         id: urlsListRepeater
-        property var _currentSwipedItem: null
 
         delegate: Loader {
-            sourceComponent: (index < limit) ? realDelegate : undefined
-            Component {
-                id: realDelegate
-                UrlDelegate{
-                    id: urlDelegate
-                    width: urlsList.width
-                    height: units.gu(5)
-
-                    icon: model.icon
-                    title: model.title ? model.title : model.url
-                    url: model.url
-
-                    onItemClicked: urlClicked(model.url)
-
-                    property var removalAnimation
-                    function remove() {
-                        removalAnimation.start()
-                    }
-
-                    onSwippingChanged: {
-                        urlsListRepeater._updateSwipeState(urlDelegate)
-                    }
-
-                    onSwipeStateChanged: {
-                        urlsListRepeater._updateSwipeState(urlDelegate)
-                    }
-
-                    leftSideAction: Action {
-                        iconName: "delete"
-                        text: i18n.tr("Delete")
-                        onTriggered: {
-                            urlDelegate.remove()
-                        }
-                    }
-
-                    ListView.onRemove: ScriptAction {
-                        script: {
-                            if (urlsListRepeater._currentSwipedItem === urlDelegate) {
-                                urlsListRepeater._currentSwipedItem = null
-                            }
-                        }
-                    }
-
-                    removalAnimation: SequentialAnimation {
-                        alwaysRunToEnd: true
-
-                        PropertyAction {
-                            target: urlDelegate
-                            property: "ListView.delayRemove"
-                            value: true
-                        }
-
-                        UbuntuNumberAnimation {
-                            target: urlDelegate
-                            property: "height"
-                            to: 0
-                        }
-
-                        PropertyAction {
-                            target: urlDelegate
-                            property: "ListView.delayRemove"
-                            value: false
-                        }
-
-                        ScriptAction {
-                            script: {
-                                urlRemoved(model.url)
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        function _updateSwipeState(item) {
-            if (item.swipping) {
-                return
-            }
-
-            if (item.swipeState !== "Normal") {
-                if (urlsListRepeater._currentSwipedItem !== item) {
-                    if (urlsListRepeater._currentSwipedItem) {
-                        urlsListRepeater._currentSwipedItem.resetSwipe()
-                    }
-                    urlsListRepeater._currentSwipedItem = item
-                }
-            } else if (item.swipeState !== "Normal"
-            && urlsListRepeater._currentSwipedItem === item) {
-                urlsListRepeater._currentSwipedItem = null
+            active: index < limit
+            sourceComponent: UrlDelegate{
+                id: urlDelegate
+                width: urlsList.width
+                height: units.gu(5)
+
+                icon: model.icon
+                title: model.title ? model.title : model.url
+                url: model.url
+
+                onClicked: urlsList.urlClicked(model.url)
+                onRemoved: urlsList.urlRemoved(model.url)
             }
         }
     }
 
=== modified file 'src/app/webbrowser/history-domainlist-chronological-model.cpp'
--- src/app/webbrowser/history-domainlist-chronological-model.cpp	2014-03-12 10:59:54 +0000
+++ src/app/webbrowser/history-domainlist-chronological-model.cpp	2015-06-02 14:24:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -48,3 +48,8 @@
         Q_EMIT sourceModelChanged();
     }
 }
+
+QString HistoryDomainListChronologicalModel::get(int index) const
+{
+    return data(this->index(index, 0), HistoryDomainListModel::Domain).toString();
+}
 
=== modified file 'src/app/webbrowser/history-domainlist-chronological-model.h'
--- src/app/webbrowser/history-domainlist-chronological-model.h	2014-03-12 10:59:54 +0000
+++ src/app/webbrowser/history-domainlist-chronological-model.h	2015-06-02 14:24:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -21,6 +21,7 @@
 
 // Qt
 #include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QString>
 
 class HistoryDomainListModel;
 
@@ -36,6 +37,8 @@
     HistoryDomainListModel* sourceModel() const;
     void setSourceModel(HistoryDomainListModel* sourceModel);
 
+    Q_INVOKABLE QString get(int index) const;
+
 Q_SIGNALS:
     void sourceModelChanged() const;
 };
 
=== modified file 'src/app/webbrowser/top-sites-model.cpp'
--- src/app/webbrowser/top-sites-model.cpp	2015-04-09 14:55:14 +0000
+++ src/app/webbrowser/top-sites-model.cpp	2015-06-02 14:24:15 +0000
@@ -34,6 +34,9 @@
     setDynamicSortFilter(true);
     setSortRole(HistoryModel::Visits);
     sort(0, Qt::DescendingOrder);
+    connect(this, SIGNAL(rowsInserted(const QModelIndex&, int, int)), SIGNAL(countChanged()));
+    connect(this, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SIGNAL(countChanged()));
+    connect(this, SIGNAL(modelReset()), SIGNAL(countChanged()));
 }
 
 HistoryTimeframeModel* TopSitesModel::sourceModel() const
@@ -46,6 +49,7 @@
     if (sourceModel != this->sourceModel()) {
         QSortFilterProxyModel::setSourceModel(sourceModel);
         Q_EMIT sourceModelChanged();
+        Q_EMIT countChanged();
     }
 }
 
 
=== modified file 'src/app/webbrowser/top-sites-model.h'
--- src/app/webbrowser/top-sites-model.h	2015-04-08 22:17:08 +0000
+++ src/app/webbrowser/top-sites-model.h	2015-06-02 14:24:15 +0000
@@ -29,6 +29,7 @@
     Q_OBJECT
 
     Q_PROPERTY(HistoryTimeframeModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
 
 public:
     TopSitesModel(QObject* parent=0);
@@ -38,6 +39,7 @@
 
 Q_SIGNALS:
     void sourceModelChanged() const;
+    void countChanged() const;
 
 protected:
     // reimplemented from QSortFilterProxyModel
 
=== removed directory 'src/app/webbrowser/upstreamcomponents'
=== removed file 'src/app/webbrowser/upstreamcomponents/ListItemWithActions.qml'
--- src/app/webbrowser/upstreamcomponents/ListItemWithActions.qml	2015-02-03 18:32:52 +0000
+++ src/app/webbrowser/upstreamcomponents/ListItemWithActions.qml	1970-01-01 00:00:00 +0000
@@ -1,372 +0,0 @@
-/*
- * Copyright (C) 2012-2014 Canonical, Ltd.
- *
- * This program 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.
- *
- * 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 QtQuick 2.0
-import Ubuntu.Components 1.1
-
-Item {
-    id: root
-
-    property Action leftSideAction: null
-    property list<Action> rightSideActions
-    property double defaultHeight: units.gu(8)
-    property bool locked: false
-    property Action activeAction: null
-    property var activeItem: null
-    property bool triggerActionOnMouseRelease: false
-    property color color: Theme.palette.normal.background
-    property color selectedColor: "#E6E6E6"
-    property bool selected: false
-    property bool selectionMode: false
-    property alias internalAnchors: mainContents.anchors
-    default property alias contents: mainContents.children
-
-    readonly property double actionWidth: units.gu(5)
-    readonly property double leftActionWidth: units.gu(10)
-    readonly property double actionThreshold: actionWidth * 0.4
-    readonly property double threshold: 0.4
-    readonly property string swipeState: main.x == 0 ? "Normal" : main.x > 0 ? "LeftToRight" : "RightToLeft"
-    readonly property alias swipping: mainItemMoving.running
-
-    signal itemClicked(var mouse)
-    signal itemPressAndHold(var mouse)
-
-    function returnToBoundsRTL()
-    {
-        var actionFullWidth = actionWidth + units.gu(2)
-        var xOffset = Math.abs(main.x)
-        var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
-
-        if (index < 1) {
-            main.x = 0
-        } else if (index === rightSideActions.length) {
-            main.x = -rightActionsView.width
-        } else {
-            main.x = -(actionFullWidth * index)
-        }
-    }
-
-    function returnToBoundsLTR()
-    {
-        var finalX = leftActionWidth
-        if (main.x > (finalX * root.threshold))
-            main.x = finalX
-        else
-            main.x = 0
-    }
-
-    function returnToBounds()
-    {
-        if (main.x < 0) {
-            returnToBoundsRTL()
-        } else if (main.x > 0) {
-            returnToBoundsLTR()
-        }
-    }
-
-    function contains(item, point)
-    {
-        return (point.x >= item.x) && (point.x <= (item.x + item.width)) && (point.y >= item.y) && (point.y <= (item.y + item.height));
-    }
-
-    function getActionAt(point)
-    {
-        if (contains(leftActionView, point)) {
-            return leftSideAction
-        } else if (contains(rightActionsView, point)) {
-            var newPoint = root.mapToItem(rightActionsView, point.x, point.y)
-            for (var i = 0; i < rightActionsRepeater.count; i++) {
-                var child = rightActionsRepeater.itemAt(i)
-                if (contains(child, newPoint)) {
-                    return i
-                }
-            }
-        }
-        return -1
-    }
-
-    function updateActiveAction()
-    {
-        if ((main.x <= -root.actionWidth) &&
-            (main.x > -rightActionsView.width)) {
-            var actionFullWidth = actionWidth + units.gu(2)
-            var xOffset = Math.abs(main.x)
-            var index = Math.min(Math.floor(xOffset / actionFullWidth), rightSideActions.length)
-            index = index - 1
-            if (index > -1) {
-                root.activeItem = rightActionsRepeater.itemAt(index)
-                root.activeAction = root.rightSideActions[index]
-            }
-        } else {
-            root.activeAction = null
-        }
-    }
-
-    function resetSwipe()
-    {
-        main.x = 0
-    }
-
-    states: [
-        State {
-            name: "select"
-            when: selectionMode || selected
-            PropertyChanges {
-                target: selectionIcon
-                source: Qt.resolvedUrl("ListItemWithActionsCheckBox.qml")
-                anchors.leftMargin: units.gu(2)
-            }
-            PropertyChanges {
-                target: root
-                locked: true
-            }
-            PropertyChanges {
-                target: main
-                x: 0
-            }
-        }
-    ]
-
-    height: defaultHeight
-    clip: height !== defaultHeight
-
-    Rectangle {
-        id: leftActionView
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            right: main.left
-        }
-        width: root.leftActionWidth + actionThreshold
-        visible: leftSideAction
-        color: "red"
-
-        Icon {
-            anchors {
-                centerIn: parent
-                horizontalCenterOffset: actionThreshold / 2
-            }
-            name: leftSideAction ? leftSideAction.iconName : ""
-            color: Theme.palette.selected.field
-            height: units.gu(3)
-            width: units.gu(3)
-        }
-    }
-
-    Item {
-       id: rightActionsView
-
-       anchors {
-           top: main.top
-           left: main.right
-           leftMargin: units.gu(1)
-           bottom: main.bottom
-       }
-       visible: rightSideActions.length > 0
-       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + actionThreshold : 0
-       Row {
-           anchors.fill: parent
-           spacing: units.gu(2)
-           Repeater {
-               id: rightActionsRepeater
-
-               model: rightSideActions
-               Item {
-                   property alias image: img
-
-                   anchors {
-                       top: parent.top
-                       bottom: parent.bottom
-                   }
-                   width: root.actionWidth
-
-                   Icon {
-                       id: img
-
-                       anchors.centerIn: parent
-                       width: units.gu(3)
-                       height: units.gu(3)
-                       name: iconName
-                       color: root.activeAction === modelData || !root.triggerActionOnMouseRelease ? UbuntuColors.lightAubergine : Theme.palette.selected.background
-                   }
-               }
-           }
-       }
-    }
-
-
-    Rectangle {
-        id: main
-        objectName: "mainItem"
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-        }
-
-        width: parent.width
-        color: mouseArea.pressed && swipeState === "Normal" ? root.selectedColor : root.color
-
-        Loader {
-            id: selectionIcon
-
-            anchors {
-                left: main.left
-                verticalCenter: main.verticalCenter
-            }
-            width: (status === Loader.Ready) ? item.implicitWidth : 0
-            visible: (status === Loader.Ready) && (item.width === item.implicitWidth)
-            Behavior on width {
-                NumberAnimation {
-                    duration: UbuntuAnimation.SnapDuration
-                }
-            }
-        }
-
-
-        Item {
-            id: mainContents
-
-            anchors {
-                left: selectionIcon.right
-                leftMargin: units.gu(2)
-                top: parent.top
-                topMargin: units.gu(1)
-                right: parent.right
-                rightMargin: units.gu(2)
-                bottom: parent.bottom
-                bottomMargin: units.gu(1)
-            }
-        }
-
-        Behavior on x {
-            UbuntuNumberAnimation {
-                id: mainItemMoving
-
-                easing.type: Easing.OutElastic
-                duration: UbuntuAnimation.SlowDuration
-            }
-        }
-        Behavior on color {
-            enabled: (root.color != root.selectedColor)
-           ColorAnimation {}
-        }
-    }
-
-    SequentialAnimation {
-        id: triggerAction
-
-        property var currentItem: root.activeItem ? root.activeItem.image : null
-
-        running: false
-        ParallelAnimation {
-            UbuntuNumberAnimation {
-                target: triggerAction.currentItem
-                property: "opacity"
-                from: 1.0
-                to: 0.0
-                duration: UbuntuAnimation.SlowDuration
-                easing {type: Easing.InOutBack; }
-            }
-            UbuntuNumberAnimation {
-                target: triggerAction.currentItem
-                properties: "width, height"
-                from: units.gu(3)
-                to: root.actionWidth
-                duration: UbuntuAnimation.SlowDuration
-                easing {type: Easing.InOutBack; }
-            }
-        }
-        PropertyAction {
-            target: triggerAction.currentItem
-            properties: "width, height"
-            value: units.gu(3)
-        }
-        PropertyAction {
-            target: triggerAction.currentItem
-            properties: "opacity"
-            value: 1.0
-        }
-        ScriptAction {
-            script: root.activeAction.triggered(root)
-        }
-        PauseAnimation {
-            duration: 500
-        }
-        UbuntuNumberAnimation {
-            target: main
-            property: "x"
-            to: 0
-
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        property bool locked: root.locked || ((root.leftSideAction === null) && (root.rightSideActions.count === 0))
-        property bool manual: false
-
-        anchors.fill: parent
-        drag {
-            target: locked ? null : main
-            axis: Drag.XAxis
-            minimumX: rightActionsView.visible ? -(rightActionsView.width + root.actionThreshold) : 0
-            maximumX: leftActionView.visible ? leftActionView.width : 0
-        }
-
-        onReleased: {
-            if (root.triggerActionOnMouseRelease && root.activeAction) {
-                triggerAction.start()
-            } else {
-                root.returnToBounds()
-                root.activeAction = null
-            }
-        }
-        onClicked: {
-            if (main.x === 0) {
-                root.itemClicked(mouse)
-            } else if (main.x > 0) {
-                var action = getActionAt(Qt.point(mouse.x, mouse.y))
-                if (action && action !== -1) {
-                    action.triggered(root)
-                }
-            } else {
-                var actionIndex = getActionAt(Qt.point(mouse.x, mouse.y))
-                if (actionIndex !== -1) {
-                    root.activeItem = rightActionsRepeater.itemAt(actionIndex)
-                    root.activeAction = root.rightSideActions[actionIndex]
-                    triggerAction.start()
-                    return
-                }
-            }
-            root.resetSwipe()
-        }
-
-        onPositionChanged: {
-            if (mouseArea.pressed) {
-                updateActiveAction()
-            }
-        }
-        onPressAndHold: {
-            if (main.x === 0) {
-                root.itemPressAndHold(mouse)
-            }
-        }
-        z: -1
-    }
-}
 
=== removed file 'src/app/webbrowser/upstreamcomponents/ListItemWithActionsCheckBox.qml'
--- src/app/webbrowser/upstreamcomponents/ListItemWithActionsCheckBox.qml	2014-10-15 09:38:37 +0000
+++ src/app/webbrowser/upstreamcomponents/ListItemWithActionsCheckBox.qml	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2012-2014 Canonical, Ltd.
- *
- * This program 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.
- *
- * 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 QtQuick 2.0
-import Ubuntu.Components 1.1
-
-CheckBox {
-    checked: root.selected
-    width: implicitWidth
-    // disable item mouse area to avoid conflicts with parent mouse area
-    __mouseArea.enabled: false
-}
 
=== removed file 'src/app/webbrowser/upstreamcomponents/MultipleSelectionListView.qml'
--- src/app/webbrowser/upstreamcomponents/MultipleSelectionListView.qml	2014-10-15 09:38:37 +0000
+++ src/app/webbrowser/upstreamcomponents/MultipleSelectionListView.qml	1970-01-01 00:00:00 +0000
@@ -1,199 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program 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.
- *
- * 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 QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0 as Popups
-
-/*!
-    \qmltype ContactSimpleListView
-    \inqmlmodule Ubuntu.Contacts 0.1
-    \ingroup ubuntu
-    \brief The MultipleSelectionListView provides a ListView with support to multiple selection
-
-    The MultipleSelectionListViewprovides a ListView with support to multiple selection which can be used by any
-    application.
-
-    Example:
-    \qml
-        import Ubuntu.Contacts 0.1
-
-        MultipleSelectionListView {
-            id: view
-            anchors.fill: paret
-            model: 100
-            delegate: Rectangle {
-                width: parent.width
-                height: 100
-                color: view.selectedItems.indexOf(index) == -1 ? "white" : "blue"
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        if (view.isInSelectionModel) {
-                            view.selectItem(index)
-                        }
-                    }
-                    onPressAndHold: view.startSelection()
-                }
-            }
-            onSelectionDone: console.debug("Selected items:" + view.selectedItems)
-        }
-    \endqml
-*/
-
-ListView {
-    id: listView
-
-    /*!
-      \qmlproperty model selectedItems
-
-      This property holds the list of selected items
-    */
-    readonly property alias selectedItems: visualModel.selectedItems
-    /*!
-      \qmlproperty bool multipleSelection
-
-      This property holds if the selection will accept multiple items or single items
-    */
-    property bool multipleSelection: true
-
-    /*!
-      \qmlproperty model listModel
-
-      This property holds the model providing data for the list.
-    */
-    property alias listModel: visualModel.model
-    /*!
-      \qmlproperty Component listDelegate
-
-      The delegate provides a template defining each item instantiated by the view.
-    */
-    property alias listDelegate: visualModel.delegate
-
-    /*!
-      \qmlproperty bool isInSelectionMode
-
-      This property holds a list with the index of selected items
-    */
-    readonly property bool isInSelectionMode: state === "selection"
-    /*!
-      This handler is called when the selection mode is finished without be canceled
-    */
-    signal selectionDone(var items)
-    /*!
-      This handler is called when the selection mode is canceled
-    */
-    signal selectionCanceled()
-
-    /*!
-      Start the selection mode on the list view.
-    */
-    function startSelection()
-    {
-        state = "selection"
-    }
-    /*!
-      Check if the item is selected
-      Returns true if the item was marked as selected or false if the item is unselected
-    */
-    function isSelected(item)
-    {
-        if (item && item.VisualDataModel) {
-            return (item.VisualDataModel.inSelected === true)
-        } else {
-            return false
-        }
-    }
-    /*!
-      Mark the item as selected
-      Returns true if the item was marked as selected or false if the item is already selected
-    */
-    function selectItem(item)
-    {
-        if (item.VisualDataModel.inSelected) {
-            return false
-        } else {
-            if (!multipleSelection) {
-                clearSelection()
-            }
-            item.VisualDataModel.inSelected = true
-            return true
-        }
-    }
-    /*!
-      Remove the index from the selected list
-    */
-    function deselectItem(item)
-    {
-        var result = false
-        if (item.VisualDataModel.inSelected) {
-            item.VisualDataModel.inSelected = false
-            result = true
-        }
-        return result
-    }
-    /*!
-      Finish the selection mode with sucess
-    */
-    function endSelection()
-    {
-        selectionDone(listView.selectedItems)
-        clearSelection()
-        state = ""
-    }
-    /*!
-      Cancel the selection
-    */
-    function cancelSelection()
-    {
-        selectionCanceled()
-        clearSelection()
-        state = ""
-    }
-    /*!
-      Remove any selected item from the selection list
-    */
-    function clearSelection()
-    {
-        if (selectedItems.count > 0) {
-            selectedItems.remove(0, selectedItems.count)
-        }
-    }
-    /*!
-      Select all items in the list
-    */
-    function selectAll()
-    {
-        if (multipleSelection) {
-            visualModel.items.addGroups(0, visualModel.items.count, ["selected"] )
-        }
-    }
-
-    model: visualModel
-
-    MultipleSelectionVisualModel {
-        id: visualModel
-    }
-
-    Component.onCompleted: {
-        // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
-        // for Flickable.maximumFlickVelocity and Flickable.flickDeceleration
-        var scaleFactor = units.gridUnit / 8;
-        maximumFlickVelocity = maximumFlickVelocity * scaleFactor;
-        flickDeceleration = flickDeceleration * scaleFactor;
-    }
-}
 
=== removed file 'src/app/webbrowser/upstreamcomponents/MultipleSelectionVisualModel.qml'
--- src/app/webbrowser/upstreamcomponents/MultipleSelectionVisualModel.qml	2014-10-15 09:38:37 +0000
+++ src/app/webbrowser/upstreamcomponents/MultipleSelectionVisualModel.qml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Canonical, Ltd.
- *
- * This program 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.
- *
- * 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 QtQuick 2.0
-
-VisualDataModel {
-    id: contactVisualModel
-
-    property alias selectedItems: selectedGroup
-
-    groups: [
-        VisualDataGroup {
-            id: selectedGroup
-
-            name: "selected"
-        }
-    ]
-}
 
=== removed file 'src/app/webbrowser/upstreamcomponents/README'
--- src/app/webbrowser/upstreamcomponents/README	2014-10-09 17:41:02 +0000
+++ src/app/webbrowser/upstreamcomponents/README	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# Upstream components
-
-This folder houses components that were taken from upstream applications like
-the Contacts App, Address Book etc. It is important to keep these files synced
-with upstream regularly. These components will be used app until they are made
-available in the Ubuntu SDK.
-
-# Links
-
-ListItemWithActions.qml
-https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/ListItemWithActions.qml
-
-ListItemWithActionsCheckBox.qml
-https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml
-
-MultipleSelectionListView.qml
-https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml
-
-MultipleSelectionVisualModel.qml
-https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/MultipleSelectionVisualModel.qml
 
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-05-20 11:31:33 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-06-02 14:24:15 +0000
@@ -361,14 +361,32 @@
 
 class NewTabView(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
-    def get_top_sites(self):
-        """Return a list of the top sites URLs."""
-        top_sites_list = self.wait_select_single(
-            UrlsList, objectName="topSitesList", visible=True)
-        return top_sites_list.get_url_list()
+    def get_bookmarks_more_button(self):
+        return self.select_single("Button", objectName="bookmarks.moreButton")
+
+    def get_homepage_bookmark(self):
+        return self.select_single(UrlDelegate, objectName="homepageBookmark")
+
+    def get_bookmarks_list(self):
+        return self.select_single(UrlsList, objectName="bookmarksList")
+
+    def get_top_sites_list(self):
+        return self.select_single(UrlsList, objectName="topSitesList")
+
+    def get_notopsites_label(self):
+        return self.select_single("Label", objectName="notopsites")
 
 
 class UrlsList(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
-    def get_url_list(self):
-        return [delegate.url for delegate in self.select_many("UrlDelegate")]
+    def get_delegates(self):
+        return sorted(self.select_many(UrlDelegate),
+                      key=lambda delegate: delegate.globalRect.y)
+
+    def get_urls(self):
+        return [delegate.url for delegate in self.get_delegates()]
+
+
+class UrlDelegate(uitk.UCListItem):
+
+    pass
 
=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2015-05-20 11:37:18 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2015-06-02 14:24:15 +0000
@@ -134,7 +134,7 @@
             self.pointing_device.click_object(tabs_action)
         else:
             self.drag_bottom_edge_upwards(0.75)
-        self.main_window.get_tabs_view()
+        return self.main_window.get_tabs_view()
 
     def open_new_tab(self):
         if (self.main_window.incognito):
 
=== added file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py'
--- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2015-06-02 14:24:15 +0000
@@ -0,0 +1,274 @@
+# -*- 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 os.path
+import sqlite3
+import time
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals, NotEquals
+
+from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
+
+
+class TestNewTabViewLifetime(StartOpenRemotePageTestCaseBase):
+
+    def test_new_tab_view_destroyed_when_browsing(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        self.main_window.go_to_url(self.base_url + "/test2")
+        new_tab_view.wait_until_destroyed()
+
+    def test_new_tab_view_destroyed_when_closing_tab(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        tabs_view = self.open_tabs_view()
+        tabs_view.get_previews()[0].close()
+        self.main_window.get_recent_view_toolbar().click_button("doneButton")
+        new_tab_view.wait_until_destroyed()
+
+    def test_new_tab_view_is_shared_between_tabs(self):
+        # Open one new tab
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        # Open a second new tab
+        self.open_tabs_view()
+        new_tab_view_2 = self.open_new_tab()
+        # Verify that they share the same NewTabView instance
+        self.assertThat(new_tab_view_2.id, Equals(new_tab_view.id))
+        # Close the second new tab, and verify that the NewTabView instance
+        # is still there
+        tabs_view = self.open_tabs_view()
+        tabs_view.get_previews()[0].close()
+        self.main_window.get_recent_view_toolbar().click_button("doneButton")
+        tabs_view.visible.wait_for(False)
+        self.assertThat(new_tab_view.visible, Equals(True))
+        # Close the first new tab, and verify that the NewTabView instance
+        # is destroyed
+        tabs_view = self.open_tabs_view()
+        tabs_view.get_previews()[0].close()
+        self.main_window.get_recent_view_toolbar().click_button("doneButton")
+        new_tab_view.wait_until_destroyed()
+
+    def test_new_tab_view_not_destroyed_when_closing_last_open_tab(self):
+        tabs_view = self.open_tabs_view()
+        tabs_view.get_previews()[0].close()
+        tabs_view.visible.wait_for(False)
+        new_tab_view = self.main_window.get_new_tab_view()
+        # Verify that the new tab view is not destroyed and then re-created
+        # when closing the last open tab if it was a blank one
+        tabs_view = self.open_tabs_view()
+        tabs_view.get_previews()[0].close()
+        tabs_view.visible.wait_for(False)
+        self.assertThat(new_tab_view.visible, Equals(True))
+
+
+class TestNewPrivateTabViewLifetime(StartOpenRemotePageTestCaseBase):
+
+    def test_new_private_tab_view_destroyed_when_browsing(self):
+        self.main_window.enter_private_mode()
+        new_private_tab_view = self.main_window.get_new_private_tab_view()
+        self.main_window.go_to_url(self.base_url + "/test2")
+        new_private_tab_view.wait_until_destroyed()
+
+    def test_new_private_tab_view_destroyed_when_leaving_private_mode(self):
+        self.main_window.enter_private_mode()
+        new_private_tab_view = self.main_window.get_new_private_tab_view()
+        self.main_window.leave_private_mode()
+        new_private_tab_view.wait_until_destroyed()
+
+    def test_new_private_tab_view_is_shared_between_tabs(self):
+        self.main_window.enter_private_mode()
+        new_private_tab_view = self.main_window.get_new_private_tab_view()
+        self.main_window.go_to_url(self.base_url + "/test2")
+        new_private_tab_view.wait_until_destroyed()
+        # Open one new private tab
+        self.open_tabs_view()
+        new_private_tab_view = self.open_new_tab()
+        # Open a second new private tab
+        self.open_tabs_view()
+        new_private_tab_view_2 = self.open_new_tab()
+        # Verify that they share the same NewPrivateTabView instance
+        self.assertThat(new_private_tab_view_2.id,
+                        Equals(new_private_tab_view.id))
+        # Close the second new private tab, and verify that the
+        # NewPrivateTabView instance is still there
+        tabs_view = self.open_tabs_view()
+        tabs_view.get_previews()[0].close()
+        self.main_window.get_recent_view_toolbar().click_button("doneButton")
+        tabs_view.visible.wait_for(False)
+        self.assertThat(new_private_tab_view.visible, Equals(True))
+        # Close the first new private tab, and verify that the
+        # NewPrivateTabView instance is destroyed
+        tabs_view = self.open_tabs_view()
+        tabs_view.get_previews()[0].close()
+        self.main_window.get_recent_view_toolbar().click_button("doneButton")
+        new_private_tab_view.wait_until_destroyed()
+
+
+class TestNewTabViewContents(StartOpenRemotePageTestCaseBase):
+
+    def setUp(self):
+        self.create_temporary_profile()
+        self.populate_config()
+        self.populate_bookmarks()
+        super(TestNewTabViewContents, self).setUp()
+
+    def populate_config(self):
+        self.homepage = "http://test/test2"
+        config_file = os.path.join(self.config_location, "webbrowser-app.conf")
+        with open(config_file, "w") as f:
+            f.write("[General]\n")
+            f.write("homepage={}".format(self.homepage))
+
+    def populate_bookmarks(self):
+        db_path = os.path.join(self.data_location, "bookmarks.sqlite")
+        connection = sqlite3.connect(db_path)
+        connection.execute("""CREATE TABLE IF NOT EXISTS bookmarks
+                              (url VARCHAR, title VARCHAR, icon VARCHAR,
+                              created INTEGER);""")
+        rows = [
+            ("http://test/periodic-table/element/24/chromium",
+             "Chromium - Element Information"),
+            ("http://test/periodic-table/element/77/iridium",
+             "Iridium - Element Information"),
+            ("http://test/periodic-table/element/31/gallium",
+             "Gallium - Element Information"),
+            ("http://test/periodic-table/element/116/livermorium",
+             "Livermorium - Element Information"),
+            ("http://test/periodic-table/element/62/samarium",
+             "Samarium - Element Information"),
+            ("http://test/periodic-table/element/63/europium",
+             "Europium - Element Information"),
+        ]
+        for i, row in enumerate(rows):
+            timestamp = int(time.time()) - i * 10
+            query = "INSERT INTO bookmarks \
+                     VALUES ('{}', '{}', '', {});"
+            query = query.format(row[0], row[1], timestamp)
+            connection.execute(query)
+        connection.commit()
+        connection.close()
+
+    def test_default_home_bookmark(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        homepage_bookmark = new_tab_view.get_homepage_bookmark()
+        self.assertThat(homepage_bookmark.url, Equals(self.homepage))
+        self.pointing_device.click_object(homepage_bookmark)
+        new_tab_view.wait_until_destroyed()
+        self.main_window.wait_until_page_loaded(self.homepage)
+
+    def test_open_bookmark(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        bookmarks = new_tab_view.get_bookmarks_list()
+        self.assertThat(lambda: len(bookmarks.get_delegates()),
+                        Eventually(Equals(4)))
+        bookmark = bookmarks.get_delegates()[1]
+        url = bookmark.url
+        self.pointing_device.click_object(bookmark)
+        new_tab_view.wait_until_destroyed()
+        self.main_window.wait_until_page_loaded(url)
+
+    def test_bookmarks_section_expands_and_collapses(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        bookmarks = new_tab_view.get_bookmarks_list()
+        top_sites = new_tab_view.get_top_sites_list()
+        self.assertThat(top_sites.visible, Equals(True))
+        # When the bookmarks list is collapsed, it shows a maximum of 4 entries
+        self.assertThat(lambda: len(bookmarks.get_delegates()),
+                        Eventually(Equals(4)))
+        # When expanded, it shows all entries
+        more_button = new_tab_view.get_bookmarks_more_button()
+        self.assertThat(more_button.visible, Equals(True))
+        self.pointing_device.click_object(more_button)
+        self.assertThat(lambda: len(bookmarks.get_delegates()),
+                        Eventually(Equals(6)))
+        self.assertThat(top_sites.visible, Eventually(Equals(False)))
+        # Collapse again
+        self.assertThat(more_button.visible, Equals(True))
+        self.pointing_device.click_object(more_button)
+        self.assertThat(lambda: len(bookmarks.get_delegates()),
+                        Eventually(Equals(4)))
+        self.assertThat(top_sites.visible, Eventually(Equals(True)))
+
+    def _remove_first_bookmark(self):
+        bookmarks = self.main_window.get_new_tab_view().get_bookmarks_list()
+        delegate = bookmarks.get_delegates()[0]
+        url = delegate.url
+        delegate.trigger_leading_action("leadingAction.delete",
+                                        delegate.wait_until_destroyed)
+        self.assertThat(lambda: bookmarks.get_urls()[0],
+                        Eventually(NotEquals(url)))
+
+    def test_remove_bookmarks_when_collapsed(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        bookmarks = new_tab_view.get_bookmarks_list()
+        self.assertThat(lambda: len(bookmarks.get_delegates()),
+                        Eventually(Equals(4)))
+        more_button = new_tab_view.get_bookmarks_more_button()
+        for i in range(3):
+            self._remove_first_bookmark()
+            self.assertThat(more_button.visible, Eventually(Equals(i < 1)))
+            self.assertThat(len(bookmarks.get_delegates()),
+                            Equals(4 if (i < 2) else 3))
+
+    def test_remove_bookmarks_when_expanded(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        bookmarks = new_tab_view.get_bookmarks_list()
+        more_button = new_tab_view.get_bookmarks_more_button()
+        self.assertThat(more_button.visible, Equals(True))
+        self.pointing_device.click_object(more_button)
+        self.assertThat(lambda: len(bookmarks.get_delegates()),
+                        Eventually(Equals(6)))
+        more_button = new_tab_view.get_bookmarks_more_button()
+        top_sites = new_tab_view.get_top_sites_list()
+        for i in range(3):
+            self._remove_first_bookmark()
+            self.assertThat(len(bookmarks.get_delegates()), Equals(5 - i))
+            self.assertThat(more_button.visible, Eventually(Equals(i < 1)))
+            self.assertThat(top_sites.visible, Eventually(Equals(i > 0)))
+
+    def test_open_top_site(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        top_sites = new_tab_view.get_top_sites_list()
+        self.assertThat(lambda: len(top_sites.get_delegates()),
+                        Eventually(Equals(1)))
+        top_site = top_sites.get_delegates()[0]
+        url = top_site.url
+        self.pointing_device.click_object(top_site)
+        new_tab_view.wait_until_destroyed()
+        self.main_window.wait_until_page_loaded(url)
+
+    def test_remove_top_sites(self):
+        self.open_tabs_view()
+        new_tab_view = self.open_new_tab()
+        top_sites = new_tab_view.get_top_sites_list()
+        self.assertThat(lambda: len(top_sites.get_delegates()),
+                        Eventually(Equals(1)))
+        notopsites_label = 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)
+        self.assertThat(lambda: len(top_sites.get_delegates()),
+                        Eventually(Equals(0)))
+        self.assertThat(notopsites_label.visible, Eventually(Equals(True)))
 
=== modified file 'tests/autopilot/webbrowser_app/tests/test_private.py'
--- tests/autopilot/webbrowser_app/tests/test_private.py	2015-05-22 19:13:31 +0000
+++ tests/autopilot/webbrowser_app/tests/test_private.py	2015-06-02 14:24:15 +0000
@@ -25,7 +25,7 @@
     def get_url_list_from_top_sites(self):
         self.open_tabs_view()
         new_tab_view = self.open_new_tab()
-        return new_tab_view.get_top_sites()
+        return new_tab_view.get_top_sites_list().get_urls()
 
     def test_going_in_and_out_private_mode(self):
         address_bar = self.main_window.address_bar
 
=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-03-20 15:28:33 +0000
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-06-02 14:24:15 +0000
@@ -71,8 +71,7 @@
         self.main_window.go_to_url(url)
         new_tab_view.wait_until_destroyed()
         self.assert_number_webviews_eventually(2)
-        self.open_tabs_view()
-        tabs_view = self.main_window.get_tabs_view()
+        tabs_view = self.open_tabs_view()
         previews = tabs_view.get_previews()
         self.assertThat(len(previews), Equals(2))
         previews[0].close()
@@ -150,8 +149,7 @@
         self.assert_number_webviews_eventually(2)
 
     def test_selecting_tab_focuses_webview(self):
-        self.open_tabs_view()
-        tabs_view = self.main_window.get_tabs_view()
+        tabs_view = self.open_tabs_view()
         tabs_view.get_previews()[0].select()
         tabs_view.visible.wait_for(False)
         webview = self.main_window.get_current_webview()
@@ -170,8 +168,7 @@
         self.assert_number_webviews_eventually(1)
 
     def test_last_webview_requests_close(self):
-        self.open_tabs_view()
-        tabs_view = self.main_window.get_tabs_view()
+        tabs_view = self.open_tabs_view()
         tabs_view.get_previews()[0].close()
         tabs_view.visible.wait_for(False)
         url = self.base_url + "/closeself"
 
=== modified file 'tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp'
--- tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp	2014-08-12 19:57:28 +0000
+++ tests/unittests/history-domainlist-chronological-model/tst_HistoryDomainListChronologicalModelTests.cpp	2015-06-02 14:24:15 +0000
@@ -99,6 +99,11 @@
         QCOMPARE(args.at(1).toInt(), 0);
         QCOMPARE(args.at(2).toInt(), 0);
     }
+
+    void shouldReturnDomain() {
+        history->add(QUrl("http://example.org/"), "Example Domain", QUrl());
+        QCOMPARE(model->get(0), QString("example.org"));
+    }
 };
 
 QTEST_MAIN(HistoryDomainListChronologicalModelTests)
 
=== modified file 'tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp'
--- tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp	2015-04-09 15:03:27 +0000
+++ tests/unittests/top-sites-model/tst_TopSitesModelTests.cpp	2015-06-02 14:24:15 +0000
@@ -74,17 +74,22 @@
 
     void shouldMatchAllWhenNothingIsHidden()
     {
+        QSignalSpy spy(topsites, SIGNAL(countChanged()));
         model->add(QUrl("http://example.org"), "Example Domain", QUrl());
         model->add(QUrl("http://example.com"), "Example Domain", QUrl());
+        QCOMPARE(spy.count(), 2);
         QCOMPARE(topsites->rowCount(), 2);
     }
 
     void shouldFilterOutHiddenUrls()
     {
+        QSignalSpy spy(topsites, SIGNAL(countChanged()));
         model->add(QUrl("http://example.org"), "Example Domain", QUrl());
         model->add(QUrl("http://example.com"), "Example Domain", QUrl());
+        QCOMPARE(spy.count(), 2);
         QCOMPARE(topsites->rowCount(), 2);
         model->hide(QUrl("http://example.org"));
+        QCOMPARE(spy.count(), 3);
         QCOMPARE(topsites->rowCount(), 1);
         QCOMPARE(topsites->data(topsites->index(0, 0), HistoryModel::Url).toUrl(), QUrl("http://example.com"));
     }