Merge into trunk : file-upload : Code : webbrowser-app

Status:	Merged
Approved by:	Olivier Tilloy on 2014-04-11
Approved revision:	455
Merged at revision:	493
Proposed branch:	lp:~michael-sheldon/webbrowser-app/file-upload
Merge into:	lp:webbrowser-app
Diff against target:	501 lines (+352/-26) 9 files modified debian/control (+3/-1) po/webbrowser-app.pot (+11/-3) src/app/ContentPickerDialog.qml (+98/-0) src/app/FilePickerDialog.qml (+44/-0) src/app/WebViewImpl.qml (+6/-0) src/app/browserapplication.cpp (+1/-20) src/app/browserapplication.h (+5/-2) tests/autopilot/webbrowser_app/tests/http_server.py (+18/-0) tests/autopilot/webbrowser_app/tests/test_content_pick.py (+166/-0)
To merge this branch:	bzr merge lp:~michael-sheldon/webbrowser-app/file-upload
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2014-03-25	Approve on 2014-04-11
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-10
Ken VanDine		2014-03-25	Needs Fixing on 2014-03-25
Review via email: mp+212605@code.launchpad.net

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-03-25:

#

Are there any related MPs required for this MP to build/function as expected? Please list.

* No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

* Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

* Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/webbrowser-app) on device or emulator?

* Yes

If you changed the UI, was the change specified/approved by design?

* Added dialog containing a ContentPeerPicker (specified in https://docs.google.com/a/canonical.com/document/d/1trse15NokU8IJ5lm3BnUi7oMNTCkUnYNHeAHZdtzFoQ)

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

* Added qtdeclarative5-ubuntu-content0.1 to dependencies, subscribed: ken-vandine

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-03-25:

#

I only reviewed the packaging changes, just one nitpick. In debian/control, please keep the package lists for depends sorted alphabetically.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

#

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

review: Approve (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-08:

#

Testing on my desktop, and I don’t have any app registered in the content hub, so the picker shows up empty, and I’m seeing the following two errors on the console:

file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Content/ResponsiveGridView.qml:37: TypeError: Cannot read property 'count' of undefined
file:///home/osomon/dev/phablet/browser/webbrowser-app/src/app/ContentPickerDialog.qml:60:17: Unable to assign [undefined] to QObject*

That’s a corner case of course, but it would be nice if it could be handled gracefully (ideally some message to the user, which would be something to discuss with design, but even without that, at least make the code robust enough to not spit out errors when the list of handlers is empty).

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-08:

#

When clicking on the cancel button of the picker, I get this error:

file:///home/osomon/dev/phablet/browser/webbrowser-app/src/app/ContentPickerDialog.qml:54: TypeError: Property 'dismiss' of object oxide::qquick::FilePickerContext(0x32d1b30) is not a function

you will need to s/dismiss()/reject()/ in src/app/ContentPickerDialog.qml.

review: Needs Fixing

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-08:

#

This should probably be 2014

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-08:

#

Can you update the license header of tests/autopilot/webbrowser_app/tests/test_content_pick.py to match that of other files in the same directory?

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-08:

#

A style nitpick: I usually do not end lines with semi-colons for javascript code in QML files.
For consistency, would you mind doing that too in src/app/ContentPickerDialog.qml ?

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-08:

#

135 + Loader {
136 + id: peerModelLoader
137 + active: false
138 + sourceComponent: ContentPeerModel {
139 + contentType: ContentType.All
140 + handler: ContentHandler.Source
141 + }
142 + }

Does this need to be a separate component? I don’t see it reused anywhere else, maybe the customPeerModelLoader property of the ContentPickerDialog instance could instantiate it directly?

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-04-08:

#

The Loader is separate because the ContentPickerDialog and gets destroyed when the dialog is closed, keeping it separate allows us to avoid having to requery the content-hub for peers every time the dialog is displayed (which is less of an issue now the dbus speed problems are resolved, but could become important again when there are a lot of peers).

(The ContentPeerPicker component will create a model itself when a custom model isn't provided, so most apps don't need to worry about this sort of thing).

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-04-08:

#

file:///home/osomon/dev/phablet/browser/webbrowser-app/src/app/ContentPickerDialog.qml:60:17: Unable to assign [undefined] to QObject*

Should be fixed now.

file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Content/ResponsiveGridView.qml:37: TypeError: Cannot read property 'count' of undefined

This one appears to have been introduced on the content-hub side when using a custom loader, so I'll fix that in a content-hub MR.

Displaying messages when no peers are found should probably also happen in the content-hub (the main ContentPeerPicker element comes from content-hub, ContentPickerDialog is just a wrapper around it to make it usable within the browser).

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-04-08:

#

Just so you're aware, there'll also be a few warnings about height bindings from the ContentTransferHint when a transfer is in progress. This is due to the ContentTransferHint being a dialog which is then being embedded in another dialog (the ContentPickerDialog), but I'm not sure there's any way around this due to the browser needing the file picker to be a dialog.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-04-08:

#

> file:///usr/lib/x86_64-linux-
> gnu/qt5/qml/Ubuntu/Content/ResponsiveGridView.qml:37: TypeError: Cannot read
> property 'count' of undefined

This is now fixed in https://code.launchpad.net/~michael-sheldon/content-hub/fix-grid-view-loader/+merge/214835. It shouldn't prevent the file picker functionality working normally before that branch is merged though, as it just effects the clipping on the grid view.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

> The Loader is separate because the ContentPickerDialog and gets destroyed when
> the dialog is closed, keeping it separate allows us to avoid having to requery
> the content-hub for peers every time the dialog is displayed (which is less of
> an issue now the dbus speed problems are resolved, but could become important
> again when there are a lot of peers).
>
> (The ContentPeerPicker component will create a model itself when a custom
> model isn't provided, so most apps don't need to worry about this sort of
> thing).

That makes sense, thanks for explaining. Would you mind adding a comment in the Loader instance to explain that? It’s not immediately obvious from a quick peak at the code, I wouldn’t want this optimization to disappear in a future refactoring.

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

I’m seeing an issue that I can reliably reproduce:

- open a page that has an input="file" widget (I’m using http://www.html5rocks.com/en/tutorials/file/dndfiles/), click the button to pick content
- choose the gallery app, select a picture, then click "Pick", you’re back to the browser and the picture has been selected in the input widget
- click the button again to e.g. pick another picture
- choose the gallery app

Expected result: the gallery app opens and I can pick a picture
Current result: I get a small dialog with a spinner that never goes away (if however in the meantime I went to the dash and manually closed the gallery app, then the issue cannot be observed)

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-04-09:

#

> I’m seeing an issue that I can reliably reproduce:
>
> - open a page that has an input="file" widget (I’m using
> http://www.html5rocks.com/en/tutorials/file/dndfiles/), click the button to
> pick content
> - choose the gallery app, select a picture, then click "Pick", you’re back to
> the browser and the picture has been selected in the input widget
> - click the button again to e.g. pick another picture
> - choose the gallery app
>
> Expected result: the gallery app opens and I can pick a picture
> Current result: I get a small dialog with a spinner that never goes away (if
> however in the meantime I went to the dash and manually closed the gallery
> app, then the issue cannot be observed)

It looks like most of the content-hub stuff is happening normally and the gallery goes in to picker mode but then just isn't brought to the foreground, I'll check with Ken what should be happening here (that functionality all lies within the content-hub-service), but my guess is that it should be given focus (and I think that happened in the past, so this might be a recent change somewhere else).

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

183 + html = '<form action="upload" method="post" enctype="multipart/form-data">'

The "=" should be "+=" here.

review: Needs Fixing

Revision history for this message

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

#

For the insensitivity workaround, instead of a timer, how about something like that:

    Connections {
        target: Qt.application
        onStateChanged: {
            if ((Qt.application.state === Qt.ApplicationActive) && (selectedItems !== null)) {
                dismissed()
                model.accept(selectedItems)
            }
        }
    }

(you would need to initialize selectedItems to null for this to work)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-04-09:

#

I was thinking about the file picker functionality on the desktop. Assuming we'll want it to operate correctly for webapps on the desktop. We probably don't want the content-hub/peer picker being launched on the desktop, but rather showing the standard File Chooser component so that the user can choose any file of their liking to upload.

What do you guys think?

Revision history for this message

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

#

> I was thinking about the file picker functionality on the desktop. Assuming
> we'll want it to operate correctly for webapps on the desktop. We probably
> don't want the content-hub/peer picker being launched on the desktop, but
> rather showing the standard File Chooser component so that the user can choose
> any file of their liking to upload.
>
> What do you guys think?

In a non-unity8 world, I think that’s the desired behaviour indeed.
Note that there’s no such thing as a standard file chooser in QML, one would have to implement one (or expose to QML a standard QFileDialog). We would also need a way to determine which dialog to use (the form factor would work as a temporary solution, but as soon as we have unity8 on the desktop it won’t work anymore).

Revision history for this message

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

#

So much for my outdated knowledge of the standard QML components… Here comes the FileDialog component, to the rescue: http://qt-project.org/doc/qt-5/qml-qtquick-dialogs-filedialog.html

Revision history for this message

Bill Filler (bfiller) wrote on 2014-04-09:

#

regarding the focus issue with content-hub, this appears to be a shell bug, filed here:
https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1305128

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-04-10:

#

The last couple of commits provide a slightly more standard file upload dialog when being used on the desktop, however this is currently using the QML file dialog implementation. If we want to use the more common QWidgets based file picker we'd need change the browser from being a QGuiApplication to being a QApplication (and add a dependency on libqt5widgets5), what are people's thoughts on this?

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-10:

#

297 +#include <QApplication>

Can you make that <QtWidgets/QApplication> for consistency with how we do #includes of Qt headers throughout the project?

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-10:

#

There’s a trivial conflict in debian/control when merging in the latest trunk, can you please fix it?
While at it, you can bump the required version of liboxideqt-qmlplugin to >= 1.0.0~bzr490 to ensure that we get the filePicker API.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-10:

#

I might be wrong, but I don’t think a build dependency on qtdeclarative5-dialogs-plugin is needed (only a runtime one).
Likewise, I don’t think the runtime dependencies that were added to qtdeclarative5-ubuntu-ui-extras-browser-plugin are needed, because the UbuntuWebView component itself is unaffected by your changes.

review: Needs Fixing

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-10:

#

76 + signal dismissed();

extraneous trailing semi-colon here ^

184 + model.accept(selectedFiles)

there’s a mix of tabs and space on this line, breaking the alignment of the code

review: Needs Fixing

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-10:

#

176 + title: i18n.tr("Please choose a file")

Since a new string has been added, the translation template has to be updated. Just run `make webbrowser-app.pot` to regenerate it in your working copy, and commit the changes.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-10:

#

20 + qtdeclarative5-ubuntu-content0.1,

I believe this one is not needed either (for the same reason mentioned above), please remove.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-10:

#

Looks good to me now. Nice job!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-10:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-11:

#

I just realized that qtdeclarative5-ubuntu-content0.1 is in universe in trusty, whereas webbrowser-app is in main, so it can’t have direct runtime deps in universe.

My suggestion is to simply remove the dependency from debian/control: since it’s only loaded dynamically at run time and only on devices where the content hub is guaranteed to be installed, it won’t make a difference.

review: Needs Fixing

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-11:

#

(for the above to work the ContentPeerModel needs to be moved from WebViewImpl to ContentPickerDialog)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2014-04-11:

#

Looks good now, thanks Michael!

review: Approve

webbrowser-app

Merge lp:~michael-sheldon/webbrowser-app/file-upload into lp:webbrowser-app

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'debian/control'
 --- debian/control	2014-04-03 14:20:39 +0000
 +++ debian/control	2014-04-11 13:15:58 +0000
@@ -31,7 +31,8 @@
  Multi-Arch: foreign
  Depends: ${misc:Depends},
           ${shlibs:Depends},
--         liboxideqt-qmlplugin (>= 1.0.0~bzr452),
++         liboxideqt-qmlplugin (>= 1.0.0~bzr490),
++         qtdeclarative5-dialogs-plugin,
           qtdeclarative5-qtquick2-plugin,
           qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
           qtdeclarative5-ubuntu-ui-toolkit-plugin,
@@ -93,6 +94,7 @@
           libautopilot-qt (>= 1.4),
           libqt5test5,
           ubuntu-ui-toolkit-autopilot,
++         unity8-autopilot,
           webbrowser-app (>= ${binary:Version}),
  Description: Ubuntu web browser autopilot tests
   A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
 === modified file 'po/webbrowser-app.pot'
 --- po/webbrowser-app.pot	2014-03-26 10:00:18 +0000
 +++ po/webbrowser-app.pot	2014-04-11 13:15:58 +0000
@@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: webbrowser-app\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2014-03-26 10:59+0100\n"
++"POT-Creation-Date: 2014-04-10 16:28+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -116,6 +116,10 @@
  msgid "Refresh page"
  msgstr ""
++#: src/app/FilePickerDialog.qml:26
++msgid "Please choose a file"
++msgstr ""
++
  #: src/app/PermissionRequest.qml:28
  msgid "Permission Request"
  msgstr ""
@@ -288,13 +292,13 @@
  #. TRANSLATORS: %1 refers to the current page’s title
  #: src/app/webbrowser/webbrowser-app.qml:35
--#: src/app/webcontainer/webapp-container.qml:44
++#: src/app/webcontainer/webapp-container.qml:45
  #, qt-format
  msgid "%1 - Ubuntu Web Browser"
  msgstr ""
  #: src/app/webbrowser/webbrowser-app.qml:37
--#: src/app/webcontainer/webapp-container.qml:46
++#: src/app/webcontainer/webapp-container.qml:47
  msgid "Ubuntu Web Browser"
  msgstr ""
@@ -313,3 +317,7 @@
  #: src/app/webcontainer/AccountsView.qml:38
  msgid "Select an account"
  msgstr ""
++
++#: src/app/webcontainer/WebViewImplWebkit.qml:63
++msgid "This page wants to know your device’s location."
++msgstr ""
 === added file 'src/app/ContentPickerDialog.qml'
 --- src/app/ContentPickerDialog.qml	1970-01-01 00:00:00 +0000
 +++ src/app/ContentPickerDialog.qml	2014-04-11 13:15:58 +0000
@@ -0,0 +1,98 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.Popups 0.1 as Popups
++import Ubuntu.Content 0.1
++
++Component {
++    Popups.PopupBase {
++        id: picker
++        property var activeTransfer
++        property var selectedItems
++
++        Rectangle {
++            anchors.fill: parent
++
++            ContentTransferHint {
++                anchors.fill: parent
++                activeTransfer: picker.activeTransfer
++            }
++
++            ContentPeerPicker {
++                id: peerPicker
++                anchors.fill: parent
++                visible: true
++                contentType: ContentType.All
++                handler: ContentHandler.Source
++
++                onPeerSelected: {
++                    if (model.allowMultipleFiles) {
++                        peer.selectionType = ContentTransfer.Multiple
++                    } else {
++                        peer.selectionType = ContentTransfer.Single
++                    }
++                    picker.activeTransfer = peer.request()
++                    stateChangeConnection.target = picker.activeTransfer
++                }
++
++                onCancelPressed: {
++                    webview.focus = true
++                    model.reject()
++                }
++            }
++        }
++
++        Connections {
++            id: stateChangeConnection
++            onStateChanged: {
++                if (picker.activeTransfer.state === ContentTransfer.Charged) {
++                    selectedItems = []
++                    for(var i in picker.activeTransfer.items) {
++                        selectedItems.push(String(picker.activeTransfer.items[i].url).replace("file://", ""))
++                    }
++                    acceptTimer.running = true
++                }
++            }
++        }
++
++        // FIXME: Work around for browser becoming insensitive to touch events
++        // if the dialog is dismissed while the application is inactive.
++        // Just listening for changes to Qt.application.active doesn't appear
++        // to be enough to resolve this, so it seems that something else needs
++        // to be happening first. As such there's a potential for a race
++        // condition here, although as yet no problem has been encountered.
++        Timer {
++            id: acceptTimer
++            interval: 100
++            repeat: true
++            onTriggered: {
++                if(Qt.application.active) {
++                    webview.focus = true
++                    model.accept(selectedItems)
++                }
++            }
++        }
++
++        Component.onCompleted: {
++            show()
++        }
++
++    }
++}
 === added file 'src/app/FilePickerDialog.qml'
 --- src/app/FilePickerDialog.qml	1970-01-01 00:00:00 +0000
 +++ src/app/FilePickerDialog.qml	2014-04-11 13:15:58 +0000
@@ -0,0 +1,44 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This file is part of webbrowser-app.
++ *
++ * webbrowser-app is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * webbrowser-app is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import QtQuick.Dialogs 1.0
++import Ubuntu.Components.Popups 0.1 as Popups
++
++Component {
++    Popups.Dialog {
++        FileDialog {
++            id: fileDialog
++            title: i18n.tr("Please choose a file")
++            selectMultiple: model.allowMultipleFiles
++
++            onAccepted: {
++                var selectedFiles = []
++                for(var i in fileDialog.fileUrls) {
++                    selectedFiles.push(fileDialog.fileUrls[i].replace("file://", ""))
++                }
++                model.accept(selectedFiles)
++            }
++
++            onRejected: {
++                model.reject()
++            }
++            Component.onCompleted: visible = true
++        }
++    }
++}
 === modified file 'src/app/WebViewImpl.qml'
 --- src/app/WebViewImpl.qml	2014-04-02 14:33:31 +0000
 +++ src/app/WebViewImpl.qml	2014-04-11 13:15:58 +0000
@@ -35,6 +35,12 @@
      confirmDialog: ConfirmDialog {}
      promptDialog: PromptDialog {}
      beforeUnloadDialog: BeforeUnloadDialog {}
++    filePicker: filePickerLoader.item
++
++    Loader {
++        id: filePickerLoader
++        source: formFactor == "desktop" ? "FilePickerDialog.qml" : "ContentPickerDialog.qml"
++    }
      /*selectionActions: ActionList {
          Actions.Copy {
 === modified file 'src/app/browserapplication.cpp'
 --- src/app/browserapplication.cpp	2014-04-02 15:15:27 +0000
 +++ src/app/browserapplication.cpp	2014-04-11 13:15:58 +0000
@@ -32,7 +32,7 @@
  #include "webbrowser-window.h"
  BrowserApplication::BrowserApplication(int& argc, char** argv)
--    : QGuiApplication(argc, argv)
++    : QApplication(argc, argv)
      , m_engine(0)
      , m_window(0)
      , m_component(0)
@@ -40,25 +40,6 @@
+ {
      m_arguments = arguments();
      m_arguments.removeFirst();
--
--    // The testability driver is only loaded by QApplication but not by
--    // QGuiApplication (see https://codereview.qt-project.org/#change,66513).
--    // Let’s load the testability driver on our own.
--    if (m_arguments.contains(QLatin1String("-testability")) ||
--        qgetenv("QT_LOAD_TESTABILITY") == "1") {
--        QLibrary testLib(QLatin1String("qttestability"));
--        if (testLib.load()) {
--            typedef void (*TasInitialize)(void);
--            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
--            if (initFunction) {
--                initFunction();
--            } else {
--                qCritical("Library qttestability resolve failed!");
--            }
--        } else {
--            qCritical("Library qttestability load failed!");
--        }
--    }
+ }
  BrowserApplication::~BrowserApplication()
 === modified file 'src/app/browserapplication.h'
 --- src/app/browserapplication.h	2014-03-27 17:35:54 +0000
 +++ src/app/browserapplication.h	2014-04-11 13:15:58 +0000
@@ -24,14 +24,17 @@
  #include <QtCore/QString>
  #include <QtCore/QStringList>
  #include <QtCore/QUrl>
--#include <QtGui/QGuiApplication>
++#include <QtWidgets/QApplication>
  class QQmlComponent;
  class QQmlEngine;
  class QQuickWindow;
  class WebBrowserWindow;
--class BrowserApplication : public QGuiApplication
++// We want the browser to be QApplication based rather than QGuiApplication
++// to provide a widget based file picker on the desktop, rather than the
++// QML fall back picker.
++class BrowserApplication : public QApplication
+ {
      Q_OBJECT
 === modified file 'tests/autopilot/webbrowser_app/tests/http_server.py'
 --- tests/autopilot/webbrowser_app/tests/http_server.py	2014-02-25 13:05:27 +0000
 +++ tests/autopilot/webbrowser_app/tests/http_server.py	2014-04-11 13:15:58 +0000
@@ -83,6 +83,24 @@
              html += 'src="/blanktargetlink" />'
              html += '</body></html>'
              self.send_html(html)
++        elif self.path == "/uploadform":
++            # craft a page that accepts clicks anywhere inside its window
++            # and on a click opens up the content picker.
++            # It also pops up an alert with the new content of the file
++            # upload field when it changes
++            self.send_response(200)
++            html = '<html><body style="margin: 0">'
++            html += '<form action="upload" method="post" '
++            html += 'enctype="multipart/form-data">'
++            html += '<input type="file" name="file" id="file" '
++            html += 'onchange="alert(this.value)"><br>'
++            html += '<input type="submit" name="submit" value="Submit">'
++            html += '</form>'
++            html += '<a href="javascript:'
++            html += 'document.getElementById(\'file\').click()">'
++            html += '<div style="height: 100%"></div></a>'
++            html += '</body></html>'
++            self.send_html(html)
          else:
              self.send_error(404)
 === added file 'tests/autopilot/webbrowser_app/tests/test_content_pick.py'
 --- tests/autopilot/webbrowser_app/tests/test_content_pick.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/webbrowser_app/tests/test_content_pick.py	2014-04-11 13:15:58 +0000
@@ -0,0 +1,166 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright 2014 Canonical
++#
++# This program is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 3, as published
++# by the Free Software Foundation.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++from __future__ import absolute_import
++
++from autopilot.introspection import get_proxy_object_for_existing_process
++from autopilot.matchers import Eventually
++from testtools.matchers import Equals, NotEquals
++from testtools import skip
++from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
++from unity8 import process_helpers as helpers
++from ubuntuuitoolkit import emulators as toolkit_emulators
++import os
++import subprocess
++
++
++@skip("Will not work until bug #1218971 is solved")
++class TestContentPick(StartOpenRemotePageTestCaseBase):
++
++    """Tests that content picking dialog show up."""
++
++    def test_pick_image(self):
++        url = self.base_url + "/uploadform"
++        self.go_to_url(url)
++        self.assert_page_eventually_loaded(url)
++        webview = self.main_window.get_current_webview()
++        self.pointing_device.click_object(webview)
++
++        dialog = self.app.wait_select_single("ContentPickerDialog")
++        self.assertThat(dialog.visible, Equals(True))
++
++
++#@skipIf(model() == 'Desktop', "Phablet only")
++@skip("Currently unable to fetch dynamically created dialogs (bug #1218971)")
++class TestContentPickerIntegration(StartOpenRemotePageTestCaseBase):
++
++    """Tests that the gallery app is brought up to choose image content"""
++
++    def tearDown(self):
++        os.system("pkill gallery-app")
++        os.system("pkill webbrowser-app")
++        super(StartOpenRemotePageTestCaseBase, self).tearDown()
++
++    def get_unity8_proxy_object(self):
++        pid = helpers._get_unity_pid()
++        return get_proxy_object_for_existing_process(pid)
++
++    def get_current_focused_appid(self, unity8):
++        return unity8.select_single("Shell").currentFocusedAppId
++
++    def set_testability_environment_variable(self):
++        """Makes sure every app opened in the environment loads the
++        testability driver."""
++
++        subprocess.check_call([
++            "/sbin/initctl",
++            "set-env",
++            "QT_LOAD_TESTABILITY=1"
++        ])
++
++    def get_app_pid(self, app):
++        """Return the PID of the named app, or -1 if it's not
++        running"""
++
++        try:
++            return int(subprocess.check_output(["pidof", app]).strip())
++        except subprocess.CalledProcessError:
++            return -1
++
++    def wait_app_focused(self, name):
++        """Wait until the app with the specified name is the
++        currently focused one"""
++
++        unity8 = self.get_unity8_proxy_object()
++        self.assertThat(
++            lambda: self.get_current_focused_appid(unity8),
++            Eventually(Equals(name))
++        )
++
++    def test_image_picker_is_gallery(self):
++        """ Tests that the gallery shows up when we are picking
++        images """
++
++        # Go to a page where clicking anywhere equals clicking on the
++        # file selection button of an upload form
++        url = self.base_url + "/uploadform"
++        self.go_to_url(url)
++        self.assert_page_eventually_loaded(url)
++        webview = self.main_window.get_current_webview()
++        self.pointing_device.click_object(webview)
++
++        # Verify that such a click brings up the gallery to select images
++        self.wait_app_focused("gallery-app")
++
++    def test_image_picker_pick_image(self):
++        """ Tests that the we can select an image in the gallery and
++            control will return to the browser with the choosen image
++            picked."""
++
++        # First run the previous test to bring up the content picker
++        self.set_testability_environment_variable()
++        self.test_image_picker_is_gallery()
++
++        # Now wait until the gallery-app process is up.
++        # NOTE: this will not work unless run on a device where unity8 runs in
++        # testability mode. To manually restart unity8 in this mode run from a
++        # python shell:
++        # from unity8 import process_helpers as p
++        # p.restart_unity_with_testability()
++        self.assertThat(lambda: self.get_app_pid("gallery-app"),
++                        Eventually(NotEquals(-1)))
++
++        gallery = get_proxy_object_for_existing_process(
++            self.get_app_pid("gallery-app"),
++            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase
++        )
++
++        # Wait for the gallery UI to completely display
++        view = gallery.wait_select_single("QQuickView")
++        self.assertThat(view.visible, Eventually(Equals(True)))
++
++        # Select the first picture on the picker by clicking on it
++        # NOTE: this is currently failing if there is anything except two
++        # pictures in the gallery (at least on a Maguro device), so I'm
++        # putting a temporary stop to the test here so that it won't break
++        # in Jenkins
++        return
++
++        grid = gallery.wait_select_single("MediaGrid")
++        photo = grid.select_many("OrganicItemInteraction")[0]
++        self.pointing_device.click_object(photo)
++        self.assertThat(photo.isSelected, Eventually(Equals(True)))
++
++        # Now the "Pick" button will be enabled and we click on it
++        button = gallery.select_single("Button", objectName="pickButton")
++        self.assertThat(button.enabled, Eventually(Equals(True)))
++        self.pointing_device.click_object(button)
++
++        # The gallery should close and focus returned to the browser
++        self.wait_app_focused("webbrowser-app")
++
++        # Verify that an image has actually been selected
++        dialog = self.app.wait_select_single("ContentPickerDialog")
++        self.assertThat(dialog.visible, Equals(True))
++        preview = dialog.wait_select_single("QQuickImage",
++                                            objectName="mediaPreview")
++        self.assertThat(preview.source, Eventually(NotEquals("")))
++
++        # Verify that now we can click the "OK" button and it closes the dialog
++        button = dialog.wait_select_single("Button", objectName="ok")
++        self.assertThat(button.enabled, Eventually(Equals(True)))
++        self.pointing_device.click_object(button)
++        self.assertThat(dialog.visible, Eventually(Equals(False)))