1
=== modified file 'debian/control'
2
--- debian/control	2014-04-03 14:20:39 +0000
3
+++ debian/control	2014-04-11 13:15:58 +0000
4
@@ -31,7 +31,8 @@
5
31
Multi-Arch: foreign
31
Multi-Arch: foreign
6
32
Depends: ${misc:Depends},
32
Depends: ${misc:Depends},
7
33
         ${shlibs:Depends},
33
         ${shlibs:Depends},
9
34
         liboxideqt-qmlplugin (>= 1.0.0~bzr452),
34
         liboxideqt-qmlplugin (>= 1.0.0~bzr490),
10
35
         qtdeclarative5-dialogs-plugin,
11
35
         qtdeclarative5-qtquick2-plugin,
36
         qtdeclarative5-qtquick2-plugin,
12
36
         qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
37
         qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
13
37
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
38
         qtdeclarative5-ubuntu-ui-toolkit-plugin,
14
@@ -93,6 +94,7 @@
15
93
         libautopilot-qt (>= 1.4),
94
         libautopilot-qt (>= 1.4),
16
94
         libqt5test5,
95
         libqt5test5,
17
95
         ubuntu-ui-toolkit-autopilot,
96
         ubuntu-ui-toolkit-autopilot,
18
97
         unity8-autopilot,
19
96
         webbrowser-app (>= ${binary:Version}),
98
         webbrowser-app (>= ${binary:Version}),
20
97
Description: Ubuntu web browser autopilot tests
99
Description: Ubuntu web browser autopilot tests
21
98
 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
100
 A lightweight web browser tailored for Ubuntu, based on the Webkit rendering
22
99
101
23
=== modified file 'po/webbrowser-app.pot'
24
--- po/webbrowser-app.pot	2014-03-26 10:00:18 +0000
25
+++ po/webbrowser-app.pot	2014-04-11 13:15:58 +0000
26
@@ -8,7 +8,7 @@
27
8
msgstr ""
8
msgstr ""
28
9
"Project-Id-Version: webbrowser-app\n"
9
"Project-Id-Version: webbrowser-app\n"
29
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
31
11
"POT-Creation-Date: 2014-03-26 10:59+0100\n"
11
"POT-Creation-Date: 2014-04-10 16:28+0100\n"
32
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
33
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
34
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
35
@@ -116,6 +116,10 @@
36
116
msgid "Refresh page"
116
msgid "Refresh page"
37
117
msgstr ""
117
msgstr ""
38
118
118
39
119
#: src/app/FilePickerDialog.qml:26
40
120
msgid "Please choose a file"
41
121
msgstr ""
42
122
43
119
#: src/app/PermissionRequest.qml:28
123
#: src/app/PermissionRequest.qml:28
44
120
msgid "Permission Request"
124
msgid "Permission Request"
45
121
msgstr ""
125
msgstr ""
46
@@ -288,13 +292,13 @@
47
288
292
48
289
#. TRANSLATORS: %1 refers to the current page’s title
293
#. TRANSLATORS: %1 refers to the current page’s title
49
290
#: src/app/webbrowser/webbrowser-app.qml:35
294
#: src/app/webbrowser/webbrowser-app.qml:35
51
291
#: src/app/webcontainer/webapp-container.qml:44
295
#: src/app/webcontainer/webapp-container.qml:45
52
292
#, qt-format
296
#, qt-format
53
293
msgid "%1 - Ubuntu Web Browser"
297
msgid "%1 - Ubuntu Web Browser"
54
294
msgstr ""
298
msgstr ""
55
295
299
56
296
#: src/app/webbrowser/webbrowser-app.qml:37
300
#: src/app/webbrowser/webbrowser-app.qml:37
58
297
#: src/app/webcontainer/webapp-container.qml:46
301
#: src/app/webcontainer/webapp-container.qml:47
59
298
msgid "Ubuntu Web Browser"
302
msgid "Ubuntu Web Browser"
60
299
msgstr ""
303
msgstr ""
61
300
304
62
@@ -313,3 +317,7 @@
63
313
#: src/app/webcontainer/AccountsView.qml:38
317
#: src/app/webcontainer/AccountsView.qml:38
64
314
msgid "Select an account"
318
msgid "Select an account"
65
315
msgstr ""
319
msgstr ""
66
320
67
321
#: src/app/webcontainer/WebViewImplWebkit.qml:63
68
322
msgid "This page wants to know your device’s location."
69
323
msgstr ""
70
316
324
71
=== added file 'src/app/ContentPickerDialog.qml'
72
--- src/app/ContentPickerDialog.qml	1970-01-01 00:00:00 +0000
73
+++ src/app/ContentPickerDialog.qml	2014-04-11 13:15:58 +0000
74
@@ -0,0 +1,98 @@
75
1
/*
76
2
 * Copyright 2014 Canonical Ltd.
77
3
 *
78
4
 * This file is part of webbrowser-app.
79
5
 *
80
6
 * webbrowser-app is free software; you can redistribute it and/or modify
81
7
 * it under the terms of the GNU General Public License as published by
82
8
 * the Free Software Foundation; version 3.
83
9
 *
84
10
 * webbrowser-app is distributed in the hope that it will be useful,
85
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
86
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
87
13
 * GNU General Public License for more details.
88
14
 *
89
15
 * You should have received a copy of the GNU General Public License
90
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
91
17
 */
92
18
93
19
import QtQuick 2.0
94
20
import Ubuntu.Components 0.1
95
21
import Ubuntu.Components.Popups 0.1 as Popups
96
22
import Ubuntu.Content 0.1
97
23
98
24
Component {
99
25
    Popups.PopupBase {
100
26
        id: picker
101
27
        property var activeTransfer
102
28
        property var selectedItems
103
29
    
104
30
        Rectangle {
105
31
            anchors.fill: parent
106
32
    
107
33
            ContentTransferHint {
108
34
                anchors.fill: parent
109
35
                activeTransfer: picker.activeTransfer
110
36
            }
111
37
    
112
38
            ContentPeerPicker {
113
39
                id: peerPicker
114
40
                anchors.fill: parent
115
41
                visible: true
116
42
                contentType: ContentType.All
117
43
                handler: ContentHandler.Source
118
44
    
119
45
                onPeerSelected: {
120
46
                    if (model.allowMultipleFiles) {
121
47
                        peer.selectionType = ContentTransfer.Multiple
122
48
                    } else {
123
49
                        peer.selectionType = ContentTransfer.Single
124
50
                    }
125
51
                    picker.activeTransfer = peer.request()
126
52
                    stateChangeConnection.target = picker.activeTransfer
127
53
                }
128
54
    
129
55
                onCancelPressed: {
130
56
                    webview.focus = true
131
57
                    model.reject()
132
58
                }
133
59
            }
134
60
        }
135
61
    
136
62
        Connections {
137
63
            id: stateChangeConnection
138
64
            onStateChanged: {
139
65
                if (picker.activeTransfer.state === ContentTransfer.Charged) {
140
66
                    selectedItems = []
141
67
                    for(var i in picker.activeTransfer.items) {
142
68
                        selectedItems.push(String(picker.activeTransfer.items[i].url).replace("file://", ""))
143
69
                    }
144
70
                    acceptTimer.running = true
145
71
                }
146
72
            }
147
73
        }
148
74
    
149
75
        // FIXME: Work around for browser becoming insensitive to touch events
150
76
        // if the dialog is dismissed while the application is inactive.
151
77
        // Just listening for changes to Qt.application.active doesn't appear
152
78
        // to be enough to resolve this, so it seems that something else needs
153
79
        // to be happening first. As such there's a potential for a race
154
80
        // condition here, although as yet no problem has been encountered.
155
81
        Timer {
156
82
            id: acceptTimer
157
83
            interval: 100
158
84
            repeat: true
159
85
            onTriggered: {
160
86
                if(Qt.application.active) {
161
87
                    webview.focus = true
162
88
                    model.accept(selectedItems)
163
89
                }
164
90
            }
165
91
        }
166
92
    
167
93
        Component.onCompleted: {
168
94
            show()
169
95
        }
170
96
    
171
97
    }
172
98
}
173
0
99
174
=== added file 'src/app/FilePickerDialog.qml'
175
--- src/app/FilePickerDialog.qml	1970-01-01 00:00:00 +0000
176
+++ src/app/FilePickerDialog.qml	2014-04-11 13:15:58 +0000
177
@@ -0,0 +1,44 @@
178
1
/*
179
2
 * Copyright 2014 Canonical Ltd.
180
3
 *
181
4
 * This file is part of webbrowser-app.
182
5
 *
183
6
 * webbrowser-app is free software; you can redistribute it and/or modify
184
7
 * it under the terms of the GNU General Public License as published by
185
8
 * the Free Software Foundation; version 3.
186
9
 *
187
10
 * webbrowser-app is distributed in the hope that it will be useful,
188
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
189
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
190
13
 * GNU General Public License for more details.
191
14
 *
192
15
 * You should have received a copy of the GNU General Public License
193
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
194
17
 */
195
18
196
19
import QtQuick 2.0
197
20
import QtQuick.Dialogs 1.0
198
21
import Ubuntu.Components.Popups 0.1 as Popups
199
22
200
23
Component {
201
24
    Popups.Dialog {
202
25
        FileDialog {
203
26
            id: fileDialog
204
27
            title: i18n.tr("Please choose a file")
205
28
            selectMultiple: model.allowMultipleFiles
206
29
    
207
30
            onAccepted: {
208
31
                var selectedFiles = []
209
32
                for(var i in fileDialog.fileUrls) {
210
33
                    selectedFiles.push(fileDialog.fileUrls[i].replace("file://", ""))
211
34
                }
212
35
                model.accept(selectedFiles)
213
36
            }
214
37
    
215
38
            onRejected: {
216
39
                model.reject()
217
40
            }
218
41
            Component.onCompleted: visible = true
219
42
        }
220
43
    }
221
44
}
222
0
45
223
=== modified file 'src/app/WebViewImpl.qml'
224
--- src/app/WebViewImpl.qml	2014-04-02 14:33:31 +0000
225
+++ src/app/WebViewImpl.qml	2014-04-11 13:15:58 +0000
226
@@ -35,6 +35,12 @@
227
35
    confirmDialog: ConfirmDialog {}
35
    confirmDialog: ConfirmDialog {}
228
36
    promptDialog: PromptDialog {}
36
    promptDialog: PromptDialog {}
229
37
    beforeUnloadDialog: BeforeUnloadDialog {}
37
    beforeUnloadDialog: BeforeUnloadDialog {}
230
38
    filePicker: filePickerLoader.item
231
39
232
40
    Loader {
233
41
        id: filePickerLoader
234
42
        source: formFactor == "desktop" ? "FilePickerDialog.qml" : "ContentPickerDialog.qml"
235
43
    }
236
38
44
237
39
    /*selectionActions: ActionList {
45
    /*selectionActions: ActionList {
238
40
        Actions.Copy {
46
        Actions.Copy {
239
41
47
240
=== modified file 'src/app/browserapplication.cpp'
241
--- src/app/browserapplication.cpp	2014-04-02 15:15:27 +0000
242
+++ src/app/browserapplication.cpp	2014-04-11 13:15:58 +0000
243
@@ -32,7 +32,7 @@
244
32
#include "webbrowser-window.h"
32
#include "webbrowser-window.h"
245
33
33
246
34
BrowserApplication::BrowserApplication(int& argc, char** argv)
34
BrowserApplication::BrowserApplication(int& argc, char** argv)
248
35
    : QGuiApplication(argc, argv)
35
    : QApplication(argc, argv)
249
36
    , m_engine(0)
36
    , m_engine(0)
250
37
    , m_window(0)
37
    , m_window(0)
251
38
    , m_component(0)
38
    , m_component(0)
252
@@ -40,25 +40,6 @@
253
40
{
40
{
254
41
    m_arguments = arguments();
41
    m_arguments = arguments();
255
42
    m_arguments.removeFirst();
42
    m_arguments.removeFirst();
256
43
257
44
    // The testability driver is only loaded by QApplication but not by
258
45
    // QGuiApplication (see https://codereview.qt-project.org/#change,66513).
259
46
    // Let’s load the testability driver on our own.
260
47
    if (m_arguments.contains(QLatin1String("-testability")) ||
261
48
        qgetenv("QT_LOAD_TESTABILITY") == "1") {
262
49
        QLibrary testLib(QLatin1String("qttestability"));
263
50
        if (testLib.load()) {
264
51
            typedef void (*TasInitialize)(void);
265
52
            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
266
53
            if (initFunction) {
267
54
                initFunction();
268
55
            } else {
269
56
                qCritical("Library qttestability resolve failed!");
270
57
            }
271
58
        } else {
272
59
            qCritical("Library qttestability load failed!");
273
60
        }
274
61
    }
275
62
}
43
}
276
63
44
277
64
BrowserApplication::~BrowserApplication()
45
BrowserApplication::~BrowserApplication()
278
65
46
279
=== modified file 'src/app/browserapplication.h'
280
--- src/app/browserapplication.h	2014-03-27 17:35:54 +0000
281
+++ src/app/browserapplication.h	2014-04-11 13:15:58 +0000
282
@@ -24,14 +24,17 @@
283
24
#include <QtCore/QString>
24
#include <QtCore/QString>
284
25
#include <QtCore/QStringList>
25
#include <QtCore/QStringList>
285
26
#include <QtCore/QUrl>
26
#include <QtCore/QUrl>
287
27
#include <QtGui/QGuiApplication>
27
#include <QtWidgets/QApplication>
288
28
28
289
29
class QQmlComponent;
29
class QQmlComponent;
290
30
class QQmlEngine;
30
class QQmlEngine;
291
31
class QQuickWindow;
31
class QQuickWindow;
292
32
class WebBrowserWindow;
32
class WebBrowserWindow;
293
33
33
295
34
class BrowserApplication : public QGuiApplication
34
// We want the browser to be QApplication based rather than QGuiApplication
296
35
// to provide a widget based file picker on the desktop, rather than the
297
36
// QML fall back picker.
298
37
class BrowserApplication : public QApplication
299
35
{
38
{
300
36
    Q_OBJECT
39
    Q_OBJECT
301
37
40
302
38
41
303
=== modified file 'tests/autopilot/webbrowser_app/tests/http_server.py'
304
--- tests/autopilot/webbrowser_app/tests/http_server.py	2014-02-25 13:05:27 +0000
305
+++ tests/autopilot/webbrowser_app/tests/http_server.py	2014-04-11 13:15:58 +0000
306
@@ -83,6 +83,24 @@
307
83
            html += 'src="/blanktargetlink" />'
83
            html += 'src="/blanktargetlink" />'
308
84
            html += '</body></html>'
84
            html += '</body></html>'
309
85
            self.send_html(html)
85
            self.send_html(html)
310
86
        elif self.path == "/uploadform":
311
87
            # craft a page that accepts clicks anywhere inside its window
312
88
            # and on a click opens up the content picker.
313
89
            # It also pops up an alert with the new content of the file
314
90
            # upload field when it changes
315
91
            self.send_response(200)
316
92
            html = '<html><body style="margin: 0">'
317
93
            html += '<form action="upload" method="post" '
318
94
            html += 'enctype="multipart/form-data">'
319
95
            html += '<input type="file" name="file" id="file" '
320
96
            html += 'onchange="alert(this.value)"><br>'
321
97
            html += '<input type="submit" name="submit" value="Submit">'
322
98
            html += '</form>'
323
99
            html += '<a href="javascript:'
324
100
            html += 'document.getElementById(\'file\').click()">'
325
101
            html += '<div style="height: 100%"></div></a>'
326
102
            html += '</body></html>'
327
103
            self.send_html(html)
328
86
        else:
104
        else:
329
87
            self.send_error(404)
105
            self.send_error(404)
330
88
106
331
89
107
332
=== added file 'tests/autopilot/webbrowser_app/tests/test_content_pick.py'
333
--- tests/autopilot/webbrowser_app/tests/test_content_pick.py	1970-01-01 00:00:00 +0000
334
+++ tests/autopilot/webbrowser_app/tests/test_content_pick.py	2014-04-11 13:15:58 +0000
335
@@ -0,0 +1,166 @@
336
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
337
2
#
338
3
# Copyright 2014 Canonical
339
4
#
340
5
# This program is free software: you can redistribute it and/or modify it
341
6
# under the terms of the GNU General Public License version 3, as published
342
7
# by the Free Software Foundation.
343
8
#
344
9
# This program is distributed in the hope that it will be useful,
345
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
346
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
347
12
# GNU General Public License for more details.
348
13
#
349
14
# You should have received a copy of the GNU General Public License
350
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
351
16
352
17
from __future__ import absolute_import
353
18
354
19
from autopilot.introspection import get_proxy_object_for_existing_process
355
20
from autopilot.matchers import Eventually
356
21
from testtools.matchers import Equals, NotEquals
357
22
from testtools import skip
358
23
from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
359
24
from unity8 import process_helpers as helpers
360
25
from ubuntuuitoolkit import emulators as toolkit_emulators
361
26
import os
362
27
import subprocess
363
28
364
29
365
30
@skip("Will not work until bug #1218971 is solved")
366
31
class TestContentPick(StartOpenRemotePageTestCaseBase):
367
32
368
33
    """Tests that content picking dialog show up."""
369
34
370
35
    def test_pick_image(self):
371
36
        url = self.base_url + "/uploadform"
372
37
        self.go_to_url(url)
373
38
        self.assert_page_eventually_loaded(url)
374
39
        webview = self.main_window.get_current_webview()
375
40
        self.pointing_device.click_object(webview)
376
41
377
42
        dialog = self.app.wait_select_single("ContentPickerDialog")
378
43
        self.assertThat(dialog.visible, Equals(True))
379
44
380
45
381
46
#@skipIf(model() == 'Desktop', "Phablet only")
382
47
@skip("Currently unable to fetch dynamically created dialogs (bug #1218971)")
383
48
class TestContentPickerIntegration(StartOpenRemotePageTestCaseBase):
384
49
385
50
    """Tests that the gallery app is brought up to choose image content"""
386
51
387
52
    def tearDown(self):
388
53
        os.system("pkill gallery-app")
389
54
        os.system("pkill webbrowser-app")
390
55
        super(StartOpenRemotePageTestCaseBase, self).tearDown()
391
56
392
57
    def get_unity8_proxy_object(self):
393
58
        pid = helpers._get_unity_pid()
394
59
        return get_proxy_object_for_existing_process(pid)
395
60
396
61
    def get_current_focused_appid(self, unity8):
397
62
        return unity8.select_single("Shell").currentFocusedAppId
398
63
399
64
    def set_testability_environment_variable(self):
400
65
        """Makes sure every app opened in the environment loads the
401
66
        testability driver."""
402
67
403
68
        subprocess.check_call([
404
69
            "/sbin/initctl",
405
70
            "set-env",
406
71
            "QT_LOAD_TESTABILITY=1"
407
72
        ])
408
73
409
74
    def get_app_pid(self, app):
410
75
        """Return the PID of the named app, or -1 if it's not
411
76
        running"""
412
77
413
78
        try:
414
79
            return int(subprocess.check_output(["pidof", app]).strip())
415
80
        except subprocess.CalledProcessError:
416
81
            return -1
417
82
418
83
    def wait_app_focused(self, name):
419
84
        """Wait until the app with the specified name is the
420
85
        currently focused one"""
421
86
422
87
        unity8 = self.get_unity8_proxy_object()
423
88
        self.assertThat(
424
89
            lambda: self.get_current_focused_appid(unity8),
425
90
            Eventually(Equals(name))
426
91
        )
427
92
428
93
    def test_image_picker_is_gallery(self):
429
94
        """ Tests that the gallery shows up when we are picking
430
95
        images """
431
96
432
97
        # Go to a page where clicking anywhere equals clicking on the
433
98
        # file selection button of an upload form
434
99
        url = self.base_url + "/uploadform"
435
100
        self.go_to_url(url)
436
101
        self.assert_page_eventually_loaded(url)
437
102
        webview = self.main_window.get_current_webview()
438
103
        self.pointing_device.click_object(webview)
439
104
440
105
        # Verify that such a click brings up the gallery to select images
441
106
        self.wait_app_focused("gallery-app")
442
107
443
108
    def test_image_picker_pick_image(self):
444
109
        """ Tests that the we can select an image in the gallery and
445
110
            control will return to the browser with the choosen image
446
111
            picked."""
447
112
448
113
        # First run the previous test to bring up the content picker
449
114
        self.set_testability_environment_variable()
450
115
        self.test_image_picker_is_gallery()
451
116
452
117
        # Now wait until the gallery-app process is up.
453
118
        # NOTE: this will not work unless run on a device where unity8 runs in
454
119
        # testability mode. To manually restart unity8 in this mode run from a
455
120
        # python shell:
456
121
        # from unity8 import process_helpers as p
457
122
        # p.restart_unity_with_testability()
458
123
        self.assertThat(lambda: self.get_app_pid("gallery-app"),
459
124
                        Eventually(NotEquals(-1)))
460
125
461
126
        gallery = get_proxy_object_for_existing_process(
462
127
            self.get_app_pid("gallery-app"),
463
128
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase
464
129
        )
465
130
466
131
        # Wait for the gallery UI to completely display
467
132
        view = gallery.wait_select_single("QQuickView")
468
133
        self.assertThat(view.visible, Eventually(Equals(True)))
469
134
470
135
        # Select the first picture on the picker by clicking on it
471
136
        # NOTE: this is currently failing if there is anything except two
472
137
        # pictures in the gallery (at least on a Maguro device), so I'm
473
138
        # putting a temporary stop to the test here so that it won't break
474
139
        # in Jenkins
475
140
        return
476
141
477
142
        grid = gallery.wait_select_single("MediaGrid")
478
143
        photo = grid.select_many("OrganicItemInteraction")[0]
479
144
        self.pointing_device.click_object(photo)
480
145
        self.assertThat(photo.isSelected, Eventually(Equals(True)))
481
146
482
147
        # Now the "Pick" button will be enabled and we click on it
483
148
        button = gallery.select_single("Button", objectName="pickButton")
484
149
        self.assertThat(button.enabled, Eventually(Equals(True)))
485
150
        self.pointing_device.click_object(button)
486
151
487
152
        # The gallery should close and focus returned to the browser
488
153
        self.wait_app_focused("webbrowser-app")
489
154
490
155
        # Verify that an image has actually been selected
491
156
        dialog = self.app.wait_select_single("ContentPickerDialog")
492
157
        self.assertThat(dialog.visible, Equals(True))
493
158
        preview = dialog.wait_select_single("QQuickImage",
494
159
                                            objectName="mediaPreview")
495
160
        self.assertThat(preview.source, Eventually(NotEquals("")))
496
161
497
162
        # Verify that now we can click the "OK" button and it closes the dialog
498
163
        button = dialog.wait_select_single("Button", objectName="ok")
499
164
        self.assertThat(button.enabled, Eventually(Equals(True)))
500
165
        self.pointing_device.click_object(button)
501
166
        self.assertThat(dialog.visible, Eventually(Equals(False)))
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