Merge lp:~uriboni/webbrowser-app/undo-close-tab into lp:webbrowser-app

[Ugo Riboni]

Add keyboard shortcuts to undo closing tabs (Ctrl+Shift+T and Ctrl+Shift+W).

Add keyboard shortcut to undo closing tabs (ctrl+shift+w)

[lp:~uriboni/webbrowser-app/undo-close-tab]

1260. By Ugo Riboni on 2015-10-27

Exclude the new tab view from being part of the undo logic

[Olivier Tilloy (osomon)]

As pointed out by mterry in https://bugs.launchpad.net/ubuntu/+source/webbrowser-app/+bug/1499767/comments/3, only saving/restoring the URL is not enough. We need to save and restore the full state of the webview, which includes back/forward history, current scroll offset, form data, … The Oxide WebView has a 'currentState' property that you can use.

[Olivier Tilloy (osomon)]

Also, Ctrl+Shift+W exit the application in chromium and firefox on desktop. For consistency with the competition, can we use Ctrl+Shift+T ?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1260
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2410/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4856/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4853/console

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

review: Needs Fixing (continuous-integration)

[lp:~uriboni/webbrowser-app/undo-close-tab]

1261. By Ugo Riboni on 2015-10-28

Should work also with the tabs list

1262. By Ugo Riboni on 2015-10-28

Fix tab close unit tests

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1262
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2413/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1167
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1167/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3925
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4876
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4876/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24639

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

review: Approve (continuous-integration)

[lp:~uriboni/webbrowser-app/undo-close-tab]

1263. By Ugo Riboni on 2015-10-28

Restore the whole state of the tab, not just its url, when undoing close

1264. By Ugo Riboni on 2015-10-28

Exclude incognito mode from the whole undo behavior

1265. By Ugo Riboni on 2015-10-28

Add AP test to verify incognito mode behavior

1266. By Ugo Riboni on 2015-10-28

Restore tabs to their previous index. Adjust AP tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1265
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2414/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4889
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1168/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1168
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4886
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24651

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1266
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2417/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4900
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1171
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1171/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4897
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4897/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24665

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

review: Approve (continuous-integration)

[lp:~uriboni/webbrowser-app/undo-close-tab]

1267. By Ugo Riboni on 2015-10-29

Add Ctrl+Shift+T as shortcut, since other major browsers have that

1268. By Ugo Riboni on 2015-10-29

Ensure that "new tab view" tabs do not get saved and restored

[Ugo Riboni (uriboni)]

Note: in the bug report both CTRL+SHIFT+T (as firefox and chrome do) and CTRL+SHIFT+W (to complement CTRL+W to close a tab) were suggested as shortcuts. I implemented both because I think they both make sense.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1268
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2425/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1179
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3953
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4909
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4909/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24703

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Incognito tabs are incorrectly being remembered: launch the browser, switch to private browsing, browse to a given page, close it with Ctrl+W, this switches back to public browsing, then press Ctrl+Shift+T: the private tab you just closed is being restored, as a public one.

review: Needs Fixing

[lp:~uriboni/webbrowser-app/undo-close-tab]

1269. By Ugo Riboni on 2015-11-02

Make sure that closing the last tab in incognito mode does not remember it. Adjust AP tests to verify.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1269
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2431/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1185
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4979
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4979/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24824

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

In test_undo_close_tab_incognito, you’re not checking which tabs are being restored, only the number of webviews after restoring a tab. And since you’re using the same URL for all tabs, the test doesn’t actually verify that it’s not restoring an incognito tab (it could be incognito or not, we won’t know unless we use different URLs for each tab.

review: Needs Fixing

[lp:~uriboni/webbrowser-app/undo-close-tab]

1270. By Ugo Riboni on 2015-11-05

Improve AP test to make sure we are not restoring tabs from incognito when exiting incognito, and to be a little bit more confident that there is no way to restore tabs when within incognito mode.

1271. By Ugo Riboni on 2015-11-05

Merge changes from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1270
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2442/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1196
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1196/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5027
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5027/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24948

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

At least the following two tests are failing on my desktop:

  webbrowser_app.tests.test_tabs.TestTabsFocus.test_focus_on_close
  webbrowser_app.tests.test_tabs.TestTabsFocus.test_focus_on_switch

It looks like Ctrl+T doesn’t work any longer to open a new tab (at least in the tests, it seems to work fine when I run the app).

review: Needs Fixing

[Olivier Tilloy (osomon)]

276 + return count;

Please remove the trailing semicolon, for consistency.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1271
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2446/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5048
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1200
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5051
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5051/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ugo Riboni (uriboni)]

> At least the following two tests are failing on my desktop:
>
> webbrowser_app.tests.test_tabs.TestTabsFocus.test_focus_on_close
> webbrowser_app.tests.test_tabs.TestTabsFocus.test_focus_on_switch
>
> It looks like Ctrl+T doesn’t work any longer to open a new tab (at least in
> the tests, it seems to work fine when I run the app).

We had the same problem in the qml-tabs-model MR, and I fixed the problem already there. Given that this code presumably will go in the same silo, and that CI seems to be happy about the tests anyway (why ?), can we avoid fixing this here too and then having to solve the conflict ?

[lp:~uriboni/webbrowser-app/undo-close-tab]

1272. By Ugo Riboni on 2015-11-08

Style: remove trailing semicolon

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1272
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2449/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1203
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1203/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4066
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5083
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5083/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24998

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

> We had the same problem in the qml-tabs-model MR, and I fixed the
> problem already there. Given that this code presumably will go in the
> same silo, and that CI seems to be happy about the tests anyway
> (why ?), can we avoid fixing this here too and then having to solve
> the conflict ?

Nothing guarantees that this will go in the same silo as the qml-tabs-model MR (especially so close to the code freeze for OTA-8). Branches should be mergeable on their own, unless one has a hard dependency on another one (but this is not the case here).

CI didn’t complain because it doesn’t run autopilot tests on desktop, only on a phone. I’ve been bugging the CI team about that, but without success so far. Until we get automated CI for desktop, we’ll need to run the tests ourselves manually to ensure they pass everywhere.

[lp:~uriboni/webbrowser-app/undo-close-tab]

1273. By Ugo Riboni on 2015-11-09

Fix AP tests by keeping in mind that when calling press_key the case of the letter keys is significant (uppercase triggers Shift implicitly)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1273
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2452/
Executed test runs:
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5087/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1206
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5092
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5092/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

I've restarted this MP to work around an issue triggering generic-deb-autopilot-vivid-touch on krillin hardware.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1273
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2454/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5092
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1208
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1208/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5097
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5097/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25021

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good to me now, thanks.

review: Approve

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-11-03 11:56:01 +0000
+++ src/app/webbrowser/Browser.qml	2015-11-09 10:55:44 +0000
@@ -376,6 +376,7 @@
             }
 
             onRequestNewTab: browser.openUrlInNewTab("", makeCurrent, true, index)
+            onTabClosed: internal.closeTab(index)
 
             onFindInPageModeChanged: {
                 if (!chrome.findInPageMode) internal.resetFocus()
@@ -1285,6 +1286,7 @@
 
     QtObject {
         id: internal
+        property var closedTabHistory: []
 
         function getOpenPages() {
             var urls = [];
@@ -1325,8 +1327,19 @@
         }
 
         function closeTab(index) {
+            // Save the incognito state before removing the tab, because
+            // removing the last tab in the model will switch out incognito
+            // mode, thus causing the check below to fail and save the tab
+            // into the undo stack when it should be forgotten instead.
+            var wasIncognito = incognito
             var tab = tabsModel.remove(index)
             if (tab) {
+                if (!wasIncognito && tab.url.toString().length > 0) {
+                    closedTabHistory.push({
+                        state: session.serializeTabState(tab),
+                        index: index
+                    })
+                }
                 tab.close()
             }
             if (tabsModel.count === 0) {
@@ -1341,6 +1354,14 @@
             }
         }
 
+        function undoCloseTab() {
+            if (!incognito && closedTabHistory.length > 0) {
+                var tabInfo = closedTabHistory.pop()
+                var tab = session.createTabFromState(tabInfo.state)
+                internal.addTab(tab, true, tabInfo.index)
+            }
+        }
+
         function switchToPreviousTab() {
             if (browser.wide) {
                 internal.switchToTab((tabsModel.currentIndex - 1 + tabsModel.count) % tabsModel.count)
@@ -1713,6 +1734,21 @@
             onTriggered: internal.switchToPreviousTab()
         }
 
+        // Ctrl+Shift+W or Ctrl+Shift+T: Undo close tab
+        KeyboardShortcut {
+            modifiers: Qt.ControlModifier | Qt.ShiftModifier
+            key: Qt.Key_W
+            enabled: chrome.visible || recentView.visible
+            onTriggered: internal.undoCloseTab()
+        }
+
+        KeyboardShortcut {
+            modifiers: Qt.ControlModifier | Qt.ShiftModifier
+            key: Qt.Key_T
+            enabled: chrome.visible || recentView.visible
+            onTriggered: internal.undoCloseTab()
+        }
+
         // Ctrl+W or Ctrl+F4: Close the current tab
         KeyboardShortcut {
             modifiers: Qt.ControlModifier

=== modified file 'src/app/webbrowser/Chrome.qml'
--- src/app/webbrowser/Chrome.qml	2015-09-23 18:43:10 +0000
+++ src/app/webbrowser/Chrome.qml	2015-11-09 10:55:44 +0000
@@ -40,6 +40,7 @@
     readonly property alias bookmarkTogglePlaceHolder: navigationBar.bookmarkTogglePlaceHolder
 
     signal requestNewTab(int index, bool makeCurrent)
+    signal tabClosed(int index)
 
     backgroundColor: incognito ? UbuntuColors.darkGrey : "#bcbcbc"
 
@@ -68,6 +69,7 @@
                 model: tabsModel
                 incognito: chrome.incognito
                 onRequestNewTab: chrome.requestNewTab(index, makeCurrent)
+                onTabClosed: chrome.tabClosed(index)
             }
 
             anchors {

=== modified file 'src/app/webbrowser/TabsBar.qml'
--- src/app/webbrowser/TabsBar.qml	2015-09-24 14:07:47 +0000
+++ src/app/webbrowser/TabsBar.qml	2015-11-09 10:55:44 +0000
@@ -33,6 +33,7 @@
     property bool incognito: false
 
     signal requestNewTab(int index, bool makeCurrent)
+    signal tabClosed(int index)
 
     MouseArea {
         anchors.fill: parent
@@ -94,7 +95,7 @@
                 Action {
                     objectName: "tab_action_close_tab"
                     text: i18n.tr("Close Tab")
-                    onTriggered: internal.closeTab(menu.targetIndex)
+                    onTriggered: root.tabClosed(menu.targetIndex)
                 }
             }
         }
@@ -150,7 +151,7 @@
 
                     rightMargin: tabDelegate.rightMargin
 
-                    onClosed: internal.closeTab(index)
+                    onClosed: root.tabClosed(index)
                     onSelected: root.model.currentIndex = index
                     onContextMenu: PopupUtils.open(contextualOptionsComponent, tabDelegate, {"targetIndex": index})
                 }
@@ -181,13 +182,4 @@
             }
         }
     }
-
-    QtObject {
-        id: internal
-
-        function closeTab(index) {
-            var tab = root.model.remove(index)
-            if (tab) tab.close()
-        }
-    }
 }

=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2015-10-16 15:29:02 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2015-11-09 10:55:44 +0000
@@ -67,7 +67,7 @@
         self.address_bar = self.main_window.address_bar
 
     def open_tab(self, url):
-        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+t')
         new_tab_view = self.main_window.get_new_tab_view()
         self.address_bar.go_to_url(url)
         new_tab_view.wait_until_destroyed()
@@ -86,7 +86,7 @@
                         Eventually(Equals(url)))
 
     def test_new_tab(self):
-        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+t')
 
         webview = self.main_window.get_current_webview()
         self.assertThat(webview.url, Equals(""))
@@ -306,7 +306,7 @@
         bookmarks_view = self.main_window.get_bookmarks_view()
         self.assertThat(bookmarks_view.activeFocus, Eventually(Equals(True)))
 
-        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+t')
         bookmarks_view.wait_until_destroyed()
 
         new_tab_view = self.main_window.get_new_tab_view()
@@ -339,7 +339,7 @@
         history_view = self.main_window.get_history_view()
         self.assertThat(history_view.activeFocus, Eventually(Equals(True)))
 
-        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+t')
         history_view.wait_until_destroyed()
 
         new_tab_view = self.main_window.get_new_tab_view()

=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-10-26 13:06:27 +0000
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-11-09 10:55:44 +0000
@@ -18,6 +18,7 @@
 from autopilot.matchers import Eventually
 from autopilot.platform import model
 
+import time
 import testtools
 import unittest
 
@@ -141,7 +142,7 @@
            the new page view"""
         address_bar = self.main_window.address_bar
 
-        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+t')
         self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
 
         self.main_window.press_key('Ctrl+Tab')
@@ -159,31 +160,31 @@
            allowing keyboard shortcuts to work without interruption"""
         address_bar = self.main_window.address_bar
 
-        self.main_window.press_key('Ctrl+T')
-        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+t')
+        self.main_window.press_key('Ctrl+t')
         url = self.base_url + "/test1"
         self.main_window.go_to_url(url)
         self.main_window.wait_until_page_loaded(url)
 
-        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+t')
         url = self.base_url + "/test2"
         self.main_window.go_to_url(url)
         self.main_window.wait_until_page_loaded(url)
-        self.main_window.press_key('Ctrl+T')
-        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+t')
+        self.main_window.press_key('Ctrl+t')
 
-        self.main_window.press_key('Ctrl+W')
+        self.main_window.press_key('Ctrl+w')
         self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
 
-        self.main_window.press_key('Ctrl+W')
-        webview = self.main_window.get_current_webview()
-        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
-
-        self.main_window.press_key('Ctrl+W')
-        webview = self.main_window.get_current_webview()
-        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
-
-        self.main_window.press_key('Ctrl+W')
+        self.main_window.press_key('Ctrl+w')
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+w')
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+w')
         self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
 
 
@@ -257,3 +258,90 @@
         webview.wait_until_destroyed()
         self.assert_number_webviews_eventually(1)
         self.main_window.get_new_tab_view()
+
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_undo_close_tab(self):
+        tabs = self.main_window.chrome.get_tabs_bar()
+        url0 = self.main_window.get_current_webview().url
+
+        self.open_new_tab()
+        url1 = self.base_url + "/tab/1"
+        self.main_window.go_to_url(url1)
+        self.main_window.wait_until_page_loaded(url1)
+        self.assert_number_webviews_eventually(2)
+
+        # Insert a "new tab view" page in the middle, without any page loaded
+        # so that we can verify that it will not be restored
+        self.open_new_tab()
+
+        self.open_new_tab()
+        url2 = self.base_url + "/tab/2"
+        self.main_window.go_to_url(url2)
+        self.main_window.wait_until_page_loaded(url2)
+        self.assert_number_webviews_eventually(4)
+
+        tabs.close_tab(3)
+        self.assert_number_webviews_eventually(3)
+        tabs.close_tab(2)
+        self.assert_number_webviews_eventually(2)
+        tabs.close_tab(1)
+        self.assert_number_webviews_eventually(1)
+        self.check_current_tab(url0)
+
+        # Both ctrl+shift+w and ctrl+shift+t activate the undo, so test both
+        self.main_window.press_key('Ctrl+Shift+w')
+        self.assert_number_webviews_eventually(2)
+        self.check_current_tab(url1)
+
+        self.main_window.press_key('Ctrl+Shift+t')
+        self.assert_number_webviews_eventually(3)
+        self.check_current_tab(url2)
+
+        self.main_window.press_key('Ctrl+Shift+t')
+        self.assert_number_webviews_eventually(3)
+        self.check_current_tab(url2)
+
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_undo_close_tab_incognito(self):
+        start_url = self.main_window.get_current_webview().url
+        self.open_new_tab()
+        url = self.base_url + "/tab/1"
+        self.main_window.go_to_url(url)
+        self.main_window.wait_until_page_loaded(url)
+
+        self.main_window.press_key('Ctrl+w')
+        self.assert_number_webviews_eventually(1)
+        self.check_current_tab(start_url)
+
+        incognito_url = self.base_url + "/tab/2"
+        self.main_window.enter_private_mode()
+        self.assertThat(self.main_window.is_in_private_mode,
+                        Eventually(Equals(True)))
+        self.main_window.go_to_url(incognito_url)
+        self.main_window.wait_until_page_loaded(incognito_url)
+
+        self.open_new_tab()
+        self.main_window.go_to_url(incognito_url)
+        self.main_window.wait_until_page_loaded(incognito_url)
+        self.main_window.press_key('Ctrl+w')
+        self.assert_number_incognito_webviews_eventually(1)
+
+        # Test that no tabs will be restored in incognito mode.
+        # We sleep for a bit after the keypress to give more confidence that
+        # the tab still hasn't appeared within a reasonable amount of time.
+        self.main_window.press_key('Ctrl+Shift+w')
+        time.sleep(1)
+        self.assert_number_incognito_webviews_eventually(1)
+
+        # Close the last incognito tab to exit the mode. This is done on
+        # purpose instead of using leave_private_mode since we want to
+        # make sure the last tab is also not saved, as it is a corner case
+        self.main_window.press_key('Ctrl+w')
+        self.assertThat(self.main_window.is_in_private_mode,
+                        Eventually(Equals(False)))
+
+        # Tabs that we closed before going incognito will be restored
+        # when going back to default mode
+        self.main_window.press_key('Ctrl+Shift+w')
+        self.assert_number_webviews_eventually(2)
+        self.check_current_tab(url)

=== modified file 'tests/unittests/qml/tst_TabsBar.qml'
--- tests/unittests/qml/tst_TabsBar.qml	2015-10-01 19:53:14 +0000
+++ tests/unittests/qml/tst_TabsBar.qml	2015-11-09 10:55:44 +0000
@@ -75,6 +75,12 @@
     }
 
     SignalSpy {
+        id: tabClosedSpy
+        target: tabs
+        signalName: "tabClosed"
+    }
+
+    SignalSpy {
         id: reloadSpy
         target: root
         signalName: "reload"
@@ -121,13 +127,16 @@
             }
             newTabRequestSpy.clear()
             reloadSpy.clear()
+            tabClosedSpy.clear()
         }
 
         function populateTabs() {
-            for (var i = 0; i < 3; ++i) {
+            var count = 3
+            for (var i = 0; i < count; ++i) {
                 tabs.appendTab("", "tab " + i, "")
             }
-            compare(tabsModel.currentIndex, 2)
+            compare(tabsModel.currentIndex, count - 1)
+            return count
         }
 
         function test_create_new_tab() {
@@ -153,11 +162,11 @@
 
         function test_mouse_middle_click() {
             // Middle click closes the tab
-            populateTabs()
-            for (var i = 2; i >= 0; --i) {
-                var tab0 = getTabDelegate(0)
-                clickItem(tab0, Qt.MiddleButton)
-                compare(tabsModel.count, i)
+            var count = populateTabs()
+            for (var i = 0; i < count; i++) {
+                var tab = getTabDelegate(i)
+                clickItem(tab, Qt.MiddleButton)
+                compare(tabClosedSpy.count, i + 1)
             }
         }
 
@@ -196,12 +205,13 @@
         }
 
         function test_close_tabs(data) {
-            populateTabs()
-            for (var i = 2; i >= 0; --i) {
-                var tab0 = getTabDelegate(0)
-                var closeButton = findChild(tab0, "closeButton")
+            var count = populateTabs()
+            for (var i = 0; i < count; i++) {
+                var tab = getTabDelegate(count - (i + 1))
+                var closeButton = findChild(tab, "closeButton")
                 clickItem(closeButton, data.button)
-                compare(tabsModel.count, i)
+                compare(tabClosedSpy.count, i + 1)
+                compare(tabClosedSpy.signalArguments[i][0], count - (i + 1))
             }
         }
 
@@ -261,9 +271,8 @@
             var menu = popupMenuOnTab(1)
             var item = getMenuItemForAction(menu, "close_tab")
             clickItem(item)
-            compare(tabsModel.count, 2)
-            compare(tabsModel.get(0).title, "tab 0")
-            compare(tabsModel.get(1).title, "tab 2")
+            compare(tabClosedSpy.count, 1)
+            compare(tabClosedSpy.signalArguments[0][0], 1)
         }
 
         function test_context_menu_reload() {