Merge lp:~abreu-alexandre/webbrowser-app/remove-qtwebkit-deps into lp:webbrowser-app

[David Barth]

remove qtwebkit deps (LP: #1362640)

remove qtwebkit deps

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:941
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1573/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1996/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/331/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/331/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/331/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1994/console

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

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

You should not touch the debian/changelog, it will be automatically changed by CI Train based on what commit message you set here (currently empty, but I'll set it according the description).

review: Needs Fixing

[Olivier Tilloy (osomon)]

Looks good, thanks for doing this!
A few minor fixes:

 - as pointed by Timo, please revert the changes to debian/changelog

 - getQtWebkitDpr() should be removed from src/Ubuntu/Web/plugin.cpp

 - src/Ubuntu/Components/Extras/Browser/hyperlinks.js should be removed

 - src/Ubuntu/Components/Extras/Browser/ua-overrides.js should be removed

 - description of qtdeclarative5-ubuntu-ui-extras-browser-plugin in debian/control should be updated to remove the mention of version 0.1 of the module

 - currentArchitecturePathName() should be removed from src/app/webcontainer/webapp-container.cpp

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

updated

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:942
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1583/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2017
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/341
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2015
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2015/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19244

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

This looks good now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:948
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1586/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/344
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/344/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1786
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2026
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2026/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19260

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

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

review: Approve

[lp:~abreu-alexandre/webbrowser-app/remove-qtwebkit-deps]

948. By Launchpad Translations on behalf of phablet-team on 2015-03-31

Launchpad automatic translations update.

[David Barth (dbarth)]

There is still an error in /usr/share/webbrowser-app/webcontainer/webapp-container.qml line 241, where there is a reference to that 'oxide' variable that got removed.

review: Needs Fixing

[lp:~abreu-alexandre/webbrowser-app/remove-qtwebkit-deps]

949. By Olivier Tilloy on 2015-03-31

Use the new locationBarController API available in oxide 1.5 to control the position of the chrome. Fixes: #1365179, #1429132
Approved by: Alexandre Abreu

950. By Olivier Tilloy on 2015-03-31

Rewrite URLs with an uppercase scheme. Fixes: #1436312

951. By Olivier Tilloy on 2015-03-31

Remove two broken symlinks.

952. By Olivier Tilloy on 2015-03-31

Always initialize member attribute at construction time.

Not really an issue here, but flagged by coverity (https://scan.coverity.com/projects/4565), and easy enough to address.

953. By CI Train Bot Account on 2015-03-31

Releasing 0.23+15.04.20150331.2-0ubuntu1

954. By CI Train Bot Account on 2015-04-07

Resync trunk.

955. By Launchpad Translations on behalf of phablet-team on 2015-04-07

Launchpad automatic translations update.

[Olivier Tilloy (osomon)]

There is now a conflict when merging this branch into the latest trunk, can you please fix it?

Additionally, you’ll need to remove a bunch of references to 'webapp.oxide' from src/app/webcontainer/WebApp.qml.

And the following line can be removed from src/app/BrowserWindow.qml:

    ignoreUnknownSignals: true (line 42)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:956
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1609/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/367
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/367/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1872
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2125
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19444

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

972 - topMargin: (webapp.oxide || webapp.chromeless) ? 0 : chromeLoader.item.height
973 + topMargin: webapp.chromeless ? 0 : chromeLoader.item.height

The above change is incorrect, the top margin should now always be 0. So the line can be removed altogether.

The ChromeController instance doesn’t need to be inside a Loader any longer, as it’s always instantiated anyway.

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

> 972 - topMargin: (webapp.oxide || webapp.chromeless) ? 0 :
> chromeLoader.item.height
> 973 + topMargin: webapp.chromeless ? 0 :
> chromeLoader.item.height
>
> The above change is incorrect, the top margin should now always be 0. So the
> line can be removed altogether.
>
>
> The ChromeController instance doesn’t need to be inside a Loader any longer,
> as it’s always instantiated anyway.

good catch, updated

[lp:~abreu-alexandre/webbrowser-app/remove-qtwebkit-deps]

956. By Alexandre Abreu on 2015-04-08

Remove qtwebkit dependencies

[Olivier Tilloy (osomon)]

One more file can be removed, as it’s not referenced anywhere any longer: src/app/PermissionRequest.qml.

Other than that, all looks good now.

review: Needs Fixing

[lp:~abreu-alexandre/webbrowser-app/remove-qtwebkit-deps]

957. By Alexandre Abreu on 2015-04-09

remove trailing file

[Olivier Tilloy (osomon)]

Looks good now, thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-04-07 17:10:56 +0000
+++ debian/control	2015-04-09 13:12:19 +0000
@@ -12,7 +12,6 @@
                python3-all,
                qml-module-qtquick2 (>= 5.4) | qtdeclarative5-qtquick2-plugin (>= 5.4),
                qml-module-qttest | qtdeclarative5-test-plugin,
-               qml-module-qtwebkit,
                qt5-default,
                qt5-qmake,
                qtbase5-dev (>= 5.4),
@@ -63,7 +62,6 @@
          libqt5sql5-sqlite,
          qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
          qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
-         qml-module-qtwebkit,
          qtdeclarative5-accounts-plugin,
          qtdeclarative5-ubuntu-ui-extras-browser-plugin (= ${binary:Version}),
          qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
@@ -83,15 +81,13 @@
          ${shlibs:Depends},
          qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
          qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
-         qml-module-qtwebkit,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-ubuntu-web-plugin (= ${binary:Version}),
 Replaces: webbrowser-app (<< 0.21)
 Breaks: webbrowser-app (<< 0.21)
 Description: Ubuntu web QML plugin
  A standalone QML plugin that contains the UbuntuWebView component
- (versions 0.1 based on WebKit and 0.2 based on Oxide), in the
- Ubuntu.Components.Extras.Browser module.
+ , in the Ubuntu.Components.Extras.Browser module.
 
 Package: qtdeclarative5-ubuntu-web-plugin
 Architecture: any

=== removed file 'src/Ubuntu/Components/Extras/Browser/ItemSelector01.qml'
--- src/Ubuntu/Components/Extras/Browser/ItemSelector01.qml	2014-07-29 21:51:07 +0000
+++ src/Ubuntu/Components/Extras/Browser/ItemSelector01.qml	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright 2013-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 1.1
-import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.Components.Popups 1.0
-
-Popover {
-    id: itemSelector
-
-    property QtObject selectorModel: model
-
-    caller: parent
-    contentWidth: Math.min(parent.width - units.gu(10), units.gu(40))
-    property real listContentHeight: 0 // intermediate property to avoid binding loop
-    contentHeight: Math.min(parent.height - units.gu(10), listContentHeight)
-
-    ListView {
-        clip: true
-        width: itemSelector.contentWidth
-        height: itemSelector.contentHeight
-
-        model: selectorModel.items
-
-        delegate: ListItem.Standard {
-            text: model.text
-            enabled: model.enabled
-            selected: model.selected
-            onClicked: selectorModel.accept(model.index)
-        }
-
-        section.property: "group"
-        section.delegate: ListItem.Header {
-            text: section
-        }
-
-        onContentHeightChanged: itemSelector.listContentHeight = contentHeight
-    }
-
-    Component.onCompleted: show()
-
-    onVisibleChanged: {
-        if (!visible) {
-            selectorModel.reject()
-        }
-    }
-}

=== removed file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml'
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml	2014-07-29 21:51:07 +0000
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml	1970-01-01 00:00:00 +0000
@@ -1,278 +0,0 @@
-/*
- * Copyright 2013-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 QtWebKit 3.1
-import QtWebKit.experimental 1.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Extras.Browser 0.1
-import Ubuntu.Components.Popups 1.0
-
-/*!
-    \qmltype MainView
-    \inqmlmodule Ubuntu.Components.Extras.Browser 0.1
-    \obsolete
-    \brief Custom Ubuntu WebView extending QtWebKit’s WebView
-
-    This version of UbuntuWebView is deprecated and shouldn’t be used in new
-    code. Use version 0.2 or higher instead.
-*/
-WebView {
-    id: _webview
-
-    signal newTabRequested(url url)
-
-    QtObject {
-        property real devicePixelRatio: QtWebKitDPR
-        onDevicePixelRatioChanged: {
-            // Do not make this patch to QtWebKit a hard requirement.
-            if (_webview.experimental.hasOwnProperty('devicePixelRatio')) {
-                _webview.experimental.devicePixelRatio = devicePixelRatio
-            }
-        }
-    }
-
-    interactive: !selection.visible
-    maximumFlickVelocity: height * 5
-
-    /**
-     * Client overridable function called before the default treatment of a
-     *  valid navigation request. This function can stop the navigation request
-     *  if it sets the 'action' field of the request to IgnoreRequest.
-     *
-     */
-    function navigationRequestedDelegate(request) { }
-
-    UserAgent01 {
-        id: userAgent
-    }
-
-    /**
-     * This function can be overridden by client applications that embed an
-     * UbuntuWebView to provide a static overridden UA string.
-     * If not overridden, the default UA string and the default override
-     * mechanism will be used.
-     */
-    function getUAString() {
-        // Note that this function used to accept a 'url' parameter to allow
-        // embedders to implement a custom override mechanism. It was removed
-        // after observing that no application was using it, and to simplify
-        // the API. Embedders willing to provide a custom override mechanism
-        // can always override (at their own risk) the onNavigationRequested
-        // slot.
-        return undefined
-    }
-    experimental.userAgent: (_webview.getUAString() === undefined) ? userAgent.defaultUA : _webview.getUAString()
-    onNavigationRequested: {
-        request.action = WebView.AcceptRequest;
-
-        navigationRequestedDelegate (request);
-        if (request.action === WebView.IgnoreRequest)
-            return;
-
-        var staticUA = _webview.getUAString()
-        if (staticUA === undefined) {
-            _webview.experimental.userAgent = userAgent.getUAString(request.url)
-        } else {
-            _webview.experimental.userAgent = staticUA
-        }
-    }
-
-    experimental.preferences.navigatorQtObjectEnabled: true
-    experimental.userScripts: [Qt.resolvedUrl("hyperlinks.js"),
-                               Qt.resolvedUrl("selection01.js")]
-    experimental.onMessageReceived: {
-        var data = null
-        try {
-            data = JSON.parse(message.data)
-        } catch (error) {
-            console.debug('DEBUG:', message.data)
-            return
-        }
-        if ('event' in data) {
-            if (data.event === 'longpress') {
-                if (('img' in data) || ('href' in data)) {
-                    contextualData.clear()
-                    if ('img' in data) {
-                        contextualData.img = data.img
-                    }
-                    if ('href' in data) {
-                        contextualData.href = data.href
-                        contextualData.title = data.title
-                    }
-                    if (contextualActions != null) {
-                        for (var i = 0; i < contextualActions.actions.length; ++i) {
-                            if (contextualActions.actions[i].enabled) {
-                                contextualRectangle.position(data)
-                                PopupUtils.open(contextualPopover, contextualRectangle)
-                                return
-                            }
-                        }
-                    }
-                }
-            }
-            if ((data.event === 'longpress') || (data.event === 'selectionadjusted')) {
-                selection.clearData()
-                selection.createData()
-                if ('html' in data) {
-                    selection.mimedata.html = data.html
-                }
-                // FIXME: push the text and image data in the order
-                // they appear in the selected block.
-                if ('text' in data) {
-                    selection.mimedata.text = data.text
-                }
-                if ('images' in data) {
-                    // TODO: download and cache the images locally
-                    // (grab them from the webview’s cache, if possible),
-                    // and forward local URLs.
-                    selection.mimedata.urls = data.images
-                }
-                selection.show(data.left, data.top, data.width, data.height)
-            } else if (data.event === 'newtab') {
-                newTabRequested(data.url)
-            }
-        }
-    }
-
-    experimental.itemSelector: ItemSelector01 {}
-
-    property alias selection: selection
-    property ActionList selectionActions
-    Selection {
-        id: selection
-
-        anchors.fill: parent
-        visible: false
-
-        property Item __popover: null
-        property var mimedata: null
-
-        Component {
-            id: selectionPopover
-            ActionSelectionPopover {
-                grabDismissAreaEvents: false
-                actions: selectionActions
-            }
-        }
-
-        function createData() {
-            if (mimedata === null) {
-                mimedata = Clipboard.newData()
-            }
-        }
-
-        function clearData() {
-            if (mimedata !== null) {
-                delete mimedata
-                mimedata = null
-            }
-        }
-
-        function actionTriggered() {
-            selection.visible = false
-        }
-
-        function __showPopover() {
-            __popover = PopupUtils.open(selectionPopover, selection.rect)
-            var actions = __popover.actions.actions
-            for (var i in actions) {
-                actions[i].onTriggered.connect(actionTriggered)
-            }
-        }
-
-        function show(x, y, width, height) {
-            var scale = _webview.experimental.test.contentsScale * _webview.experimental.test.devicePixelRatio
-            rect.x = x * scale + _webview.contentX
-            rect.y = y * scale + _webview.contentY
-            rect.width = width * scale
-            rect.height = height * scale
-            visible = true
-            __showPopover()
-        }
-
-        onVisibleChanged: {
-            if (!visible && (__popover != null)) {
-                PopupUtils.close(__popover)
-                __popover = null
-            }
-        }
-
-        onResized: {
-            var message = new Object
-            message.query = 'adjustselection'
-            var rect = selection.rect
-            var scale = _webview.experimental.test.contentsScale * _webview.experimental.test.devicePixelRatio
-            message.left = (rect.x - _webview.contentX) / scale
-            message.right = (rect.x + rect.width - _webview.contentX) / scale
-            message.top = (rect.y - _webview.contentY) / scale
-            message.bottom = (rect.y + rect.height - _webview.contentY) / scale
-            _webview.experimental.postMessage(JSON.stringify(message))
-        }
-
-        function copy() {
-            Clipboard.push(mimedata)
-            clearData()
-        }
-    }
-
-    Item {
-        id: contextualRectangle
-
-        visible: false
-
-        function position(data) {
-            var scale = _webview.experimental.test.contentsScale * _webview.experimental.test.devicePixelRatio
-            x = data.left * scale
-            y = data.top * scale
-            width = data.width * scale
-            height = data.height * scale
-        }
-    }
-    property QtObject contextualData: QtObject {
-        property url href
-        property string title
-        property url img
-
-        function clear() {
-            href = ''
-            title = ''
-            img = ''
-        }
-    }
-
-    property ActionList contextualActions
-    Component {
-        id: contextualPopover
-        ActionSelectionPopover {
-            actions: contextualActions
-        }
-    }
-
-    Scrollbar {
-        parent: _webview.parent
-        flickableItem: _webview
-        align: Qt.AlignTrailing
-    }
-
-    Scrollbar {
-        parent: _webview.parent
-        flickableItem: _webview
-        align: Qt.AlignBottom
-    }
-}

=== removed file 'src/Ubuntu/Components/Extras/Browser/UserAgent01.qml'
--- src/Ubuntu/Components/Extras/Browser/UserAgent01.qml	2014-07-29 21:51:07 +0000
+++ src/Ubuntu/Components/Extras/Browser/UserAgent01.qml	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright 2013-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.Window 2.0
-import Ubuntu.Components 1.1
-import "ua-overrides.js" as Overrides
-
-/*
- * Useful documentation:
- *   http://en.wikipedia.org/wiki/User_agent#Format
- *   https://developer.mozilla.org/en-US/docs/Gecko_user_agent_string_reference
- *   https://wiki.mozilla.org/B2G/User_Agent
- *   https://github.com/mozilla-b2g/gaia/blob/master/build/ua-override-prefs.js
- *   https://developers.google.com/chrome/mobile/docs/user-agent
- */
-
-// This is an Item, not a QtObject, because it needs information about the Screen.
-Item {
-    // %1: form factor (Mobile, Tablet, Desktop)
-    // %2: WebKit version
-    readonly property string _template: "Mozilla/5.0 (Ubuntu; %1) WebKit/%2"
-
-    // See Source/WebCore/Configurations/Version.xcconfig in QtWebKit’s source tree
-    // TODO: determine this value at runtime
-    readonly property string _webkitVersion: "537.21"
-
-    // FIXME: this is a quick hack that will become increasingly unreliable
-    // as we support more devices, so we need a better solution for this
-    // FIXME: only handling phone and tablet for now, need to handle desktop too
-    readonly property string _formFactor: (Screen.width >= units.gu(60)) ? "Tablet" : "Mobile"
-
-    property string defaultUA: _template.arg(_formFactor).arg(_webkitVersion)
-
-    property var overrides: Overrides.overrides
-
-    function getDomain(url) {
-        var domain = url.toString()
-        var indexOfScheme = domain.indexOf("://")
-        if (indexOfScheme !== -1) {
-            domain = domain.slice(indexOfScheme + 3)
-        }
-        var indexOfPath = domain.indexOf("/")
-        if (indexOfPath !== -1) {
-            domain = domain.slice(0, indexOfPath)
-        }
-        return domain
-    }
-
-    function getDomains(domain) {
-        var components = domain.split(".")
-        var domains = []
-        for (var i = 0; i < components.length; i++) {
-            domains.push(components.slice(i).join("."))
-        }
-        return domains
-    }
-
-    function getUAString(url) {
-        var ua = defaultUA
-        var domains = getDomains(getDomain(url))
-        for (var i = 0; i < domains.length; i++) {
-            var domain = domains[i]
-            if (domain in overrides) {
-                var form = overrides[domain]
-                if (typeof form == "string") {
-                    return form
-                } else if (typeof form == "object") {
-                    return ua.replace(form[0], form[1])
-                }
-            }
-        }
-        return ua
-    }
-}

=== removed file 'src/Ubuntu/Components/Extras/Browser/dummysingleton.qml'
--- src/Ubuntu/Components/Extras/Browser/dummysingleton.qml	2014-04-16 13:24:56 +0000
+++ src/Ubuntu/Components/Extras/Browser/dummysingleton.qml	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * 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/>.
- */
-
-// This file is not really used, but without it importing version 0.1 of
-// Ubuntu.Components.Extras.Browser fails because the QML engine requests type
-// UbuntuSharedWebContext, despite it being specific to version 0.2 of the
-// module.
-
-pragma Singleton
-
-import QtQml 2.0
-
-QtObject {}

=== removed file 'src/Ubuntu/Components/Extras/Browser/hyperlinks.js'
--- src/Ubuntu/Components/Extras/Browser/hyperlinks.js	2013-06-17 16:50:17 +0000
+++ src/Ubuntu/Components/Extras/Browser/hyperlinks.js	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This file is part of ubuntu-browser.
- *
- * ubuntu-browser 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.
- *
- * ubuntu-browser 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/>.
- */
-
-function handleClickEvent(event) {
-    var node = event.target;
-    while (node) {
-        if (node.nodeName.toLowerCase() == 'a') {
-            // Using event delegation to work around the lack of support for
-            // handling hyperlinks with a target attribute set to '_blank' in
-            // QtWebKit. See related upstream bug reports:
-            //    https://bugs.webkit.org/show_bug.cgi?id=76416
-            //    https://bugs.webkit.org/show_bug.cgi?id=91779
-            if (node.hasAttribute('target')) {
-                var target = node.getAttribute('target').toLowerCase();
-                if ((target == '_blank') || (target == '"_blank"')) {
-                    var link = {'event': 'newtab', 'url': node.href};
-                    navigator.qt.postMessage(JSON.stringify(link));
-                }
-            }
-            break;
-        }
-        node = node.parentNode;
-    }
-}
-
-var doc = document.documentElement;
-doc.addEventListener('click', handleClickEvent);
-
-var frames = doc.getElementsByTagName('iframe');
-for (var i = 0; i < frames.length; i++) {
-    frames[i].addEventListener('load', function() {
-        var doc = this.contentDocument;
-        if (doc) {
-            doc.documentElement.addEventListener('click', handleClickEvent);
-        }
-    });
-}

=== modified file 'src/Ubuntu/Components/Extras/Browser/qmldir'
--- src/Ubuntu/Components/Extras/Browser/qmldir	2014-05-29 15:30:11 +0000
+++ src/Ubuntu/Components/Extras/Browser/qmldir	2015-04-09 13:12:19 +0000
@@ -1,10 +1,6 @@
 module Ubuntu.Components.Extras.Browser
 plugin ubuntu-ui-extras-browser-plugin
-UbuntuWebView 0.1 UbuntuWebView01.qml
 UbuntuWebView 0.2 UbuntuWebView02.qml
 singleton UbuntuSharedWebContext 0.2 UbuntuSharedWebContext.qml
 singleton SharedWebContext 0.2 UbuntuSharedWebContext.qml
 UbuntuWebContext 0.2 UbuntuWebContext.qml
-# Without the following lines, importing version 0.1 of the module fails
-singleton UbuntuSharedWebContext 0.1 dummysingleton.qml
-singleton SharedWebContext 0.1 dummysingleton.qml

=== removed file 'src/Ubuntu/Components/Extras/Browser/selection01.js'
--- src/Ubuntu/Components/Extras/Browser/selection01.js	2015-01-23 13:26:40 +0000
+++ src/Ubuntu/Components/Extras/Browser/selection01.js	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-/*
- * Copyright 2013-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/>.
- */
-
-// List of domains known to interfere with touch events listeners
-var blacklist = [
-    "m.8tracks.com", // http://pad.lv/1279903
-];
-if (blacklist.indexOf(document.domain) === -1) {
-
-    function elementContainedInBox(element, box) {
-        var rect = element.getBoundingClientRect();
-        return ((box.left <= rect.left) && (box.right >= rect.right) &&
-                (box.top <= rect.top) && (box.bottom >= rect.bottom));
-    }
-
-    function getImgFullUri(uri) {
-        if ((uri.slice(0, 7) === 'http://') ||
-            (uri.slice(0, 8) === 'https://') ||
-            (uri.slice(0, 7) === 'file://') || 
-            (uri.slice(0, 5) === 'data:')) {
-            return uri;
-        } else if (uri.slice(0, 1) === '/') {
-            var docuri = document.documentURI;
-            var firstcolon = docuri.indexOf('://');
-            var protocol = 'http://';
-            if (firstcolon !== -1) {
-                protocol = docuri.slice(0, firstcolon + 3);
-            }
-            if (uri.slice(0, 2) === '//') {
-                // URLs beginning with a // should just inherit the protocol
-                // from the current page
-                return protocol + uri.slice(2);
-            } else {
-                return protocol + document.domain + uri;
-            }
-        } else {
-            var base = document.baseURI;
-            var lastslash = base.lastIndexOf('/');
-            if (lastslash === -1) {
-                return base + '/' + uri;
-            } else {
-                return base.slice(0, lastslash + 1) + uri;
-            }
-        }
-    }
-
-    function getSelectedData(element) {
-        var node = element;
-        var data = new Object;
-
-        var nodeName = node.nodeName.toLowerCase();
-        if (nodeName === 'img') {
-            data.img = getImgFullUri(node.getAttribute('src'));
-        } else if (nodeName === 'a') {
-            data.href = node.href;
-            data.title = node.title;
-        }
-
-        // If the parent tag is a hyperlink, we want it too.
-        var parent = node.parentNode;
-        if ((nodeName !== 'a') && parent && (parent.nodeName.toLowerCase() === 'a')) {
-            data.href = parent.href;
-            data.title = parent.title;
-            node = parent;
-        }
-
-        var boundingRect = node.getBoundingClientRect();
-        data.left = boundingRect.left;
-        data.top = boundingRect.top;
-        data.width = boundingRect.width;
-        data.height = boundingRect.height;
-
-        node = node.cloneNode(true);
-        // filter out script nodes
-        var scripts = node.getElementsByTagName('script');
-        while (scripts.length > 0) {
-            var scriptNode = scripts[0];
-            if (scriptNode.parentNode) {
-                scriptNode.parentNode.removeChild(scriptNode);
-            }
-        }
-        data.html = node.outerHTML;
-        data.nodeName = node.nodeName.toLowerCase();
-        // FIXME: extract the text and images in the order they appear in the block,
-        // so that this order is respected when the data is pushed to the clipboard.
-        data.text = node.textContent;
-        var images = [];
-        var imgs = node.getElementsByTagName('img');
-        for (var i = 0; i < imgs.length; i++) {
-            images.push(getImgFullUri(imgs[i].getAttribute('src')));
-        }
-        if (images.length > 0) {
-            data.images = images;
-        }
-
-        return data;
-    }
-
-    function adjustSelection(selection) {
-        // FIXME: allow selecting two consecutive blocks, instead of
-        // interpolating to the containing block.
-        var centerX = (selection.left + selection.right) / 2;
-        var centerY = (selection.top + selection.bottom) / 2;
-        var element = document.elementFromPoint(centerX, centerY);
-        var parent = element;
-        while (elementContainedInBox(parent, selection)) {
-            parent = parent.parentNode;
-        }
-        element = parent;
-        return getSelectedData(element);
-    }
-
-    function distance(touch1, touch2) {
-        return Math.sqrt(Math.pow(touch2.clientX - touch1.clientX, 2) +
-                         Math.pow(touch2.clientY - touch1.clientY, 2));
-    }
-
-    navigator.qt.onmessage = function(message) {
-        var data = null;
-        try {
-            data = JSON.parse(message.data);
-        } catch (error) {
-            return;
-        }
-        if ('query' in data) {
-            if (data.query === 'adjustselection') {
-                var selection = adjustSelection(data);
-                selection.event = 'selectionadjusted';
-                navigator.qt.postMessage(JSON.stringify(selection));
-            }
-        }
-    }
-
-    var longpressObserver = -1;
-    var currentTouch = null;
-    var longpressDetected = false;
-
-    function longPressDetected(x, y) {
-        longpressDetected = true;
-        var element = document.elementFromPoint(x, y);
-        var data = getSelectedData(element);
-        data.event = 'longpress';
-        navigator.qt.postMessage(JSON.stringify(data));
-    }
-
-    function clearLongpressTimeout() {
-        clearTimeout(longpressObserver);
-        longpressObserver = -1;
-        currentTouch = null;
-    }
-
-    var doc = document.documentElement;
-
-    doc.addEventListener('touchstart', function(event) {
-        if (event.touches.length == 1) {
-            currentTouch = event.touches[0];
-            longpressObserver = setTimeout(longPressDetected, 800, currentTouch.clientX, currentTouch.clientY);
-        }
-    });
-
-    doc.addEventListener('touchend', function(event) {
-        if (longpressDetected) {
-            longpressDetected = false;
-            event.preventDefault();
-        }
-        clearLongpressTimeout();
-    });
-
-    doc.addEventListener('touchmove', function(event) {
-        if (!currentTouch) {
-            return;
-        } 
-        if ((event.changedTouches.length > 1) || (distance(event.changedTouches[0], currentTouch) > 3)) {
-            clearLongpressTimeout();
-        }
-    });
-
-    doc.addEventListener('touchcancel', function(event) {
-        if (longpressDetected) {
-            longpressDetected = false;
-        }
-        clearLongpressTimeout();
-    });
-
-}

=== removed file 'src/Ubuntu/Components/Extras/Browser/ua-overrides.js'
--- src/Ubuntu/Components/Extras/Browser/ua-overrides.js	2013-11-19 18:09:46 +0000
+++ src/Ubuntu/Components/Extras/Browser/ua-overrides.js	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This file is part of webbrowser-app.
- *
- * webbrowser-app is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * webbrowser-app is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-.pragma library
-
-// B2G’s list of overrides: https://hg.mozilla.org/mozilla-central/raw-file/tip/b2g/app/ua-update.json.in
-
-// List of user agent string overrides in the form of an object.
-// Each key is a domain name for which the default user agent string doesn’t
-// work well enough. Values can either be a string (full override) or an array
-// containing two values that are passed to the String.replace method (the
-// first value may be either a string or a regular expression, the second value
-// must be a string).
-
-// Examples of valid entries:
-//     "example.org": "full override"
-//     "example.com": ["Ubuntu", "Ubuntu Edge"]
-//     "google.com": [/mobi/i, "b"]
-
-// The original list was initially built from the top 100 entries
-// at http://www.alexa.com/topsites (2013-08-16), using Chrome on
-// Android as a reference.
-
-var overrides = {
-    // Google+ is special, scroll doesn't work with an AppleWebkit personality
-    "plus.google.com": ["Mobile", "Android; Mobile"],
-
-    "google.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.co.in": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.de": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.co.uk": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.fr": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.com.br": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.co.jp": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.com.hk": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.ru": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.it": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.es": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.com.mx": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.ca": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.com.tr": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.com.au": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-    "google.pl": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-
-    "youtube.com": [/Mobile\) WebKit\/([.0-9]*)/, "Linux) WebKit/$1 (like Android 4.3) Ubuntu Mobile"],
-
-    "twitter.com": ["Mobile)", "Mobile) Firefox"],
-
-    // while this issue gets resolved (https://bugs.launchpad.net/ubuntu/+source/ubuntu-keyboard/+bug/1233207)
-    "login.ubuntu.com": [/Mobile\) WebKit\/[.0-9]*/, "Android 4.3) AppleWebKit Mobile Safari"],
-
-    "yahoo.com": ["Mobile", "Android; Mobile"],
-    "baidu.com": ["Mobile", "Android; Mobile"],
-    "qq.com": [/WebKit\/[.0-9]*/, "Apple$& Mobile"],
-    "amazon.com": ["Mobile", "Android; Mobile"],
-    "linkedin.com": ["Mobile", "Android; Mobile"],
-    "blogspot.com": ["Mobile", "Android; Mobile"],
-    "taobao.com": ["Mobile", "Android; Mobile"],
-    "bing.com": ["Mobile", "Android; Mobile"],
-    "yahoo.co.jp": ["Ubuntu", "Linux; Android 4; Galaxy Build/"],
-    "yandex.ru": ["Mobile", "Android; Mobile"],
-    "sina.com.cn": ["Mobile", "Android; Mobile"],
-    "ebay.com": ["Mobile", "Android; Mobile"],
-    "tumblr.com": ["Mobile", "Android; Mobile"],
-    "msn.com": ["Mobile", "Android; Mobile"],
-    "mail.ru": ["Ubuntu", "Linux; Android 4; Galaxy Build/"],
-    "hao123.com": ["Mobile", "Android; Mobile"],
-    "ask.com": ["Mobile", "Android; Mobile"],
-    "blogger.com": ["Mobile", "Android; Mobile"],
-    "imdb.com": ["Mobile", "Android; Mobile"],
-    "amazon.co.jp": ["Mobile", "Android; Mobile"],
-    "tmall.com": ["Mobile", "Android; Mobile"],
-    "fc2.com": ["Mobile", "Android; Mobile"],
-    "soso.com": ["Mobile", "Android; Mobile"],
-    "delta-search.com": ["Mobile", "Android; Mobile"],
-    "odnoklassniki.ru": ["Mobile", "Android; Mobile"],
-    "alibaba.com": ["Mobile", "Android; Mobile"],
-    "flickr.com": ["Mobile", "Android; Mobile"],
-    "amazon.de": ["Mobile", "Android; Mobile"],
-    "blogspot.in": ["Mobile", "Android; Mobile"],
-    "ifeng.com": ["Mobile", "Android; Mobile"],
-    "360.cn": ["Mobile", "Android; Mobile"],
-    "youku.com": ["Mobile", "Android; Mobile"],
-    "ebay.de": ["Mobile", "Android; Mobile"],
-    "uol.com.br": ["Mobile", "Android; Mobile"],
-    "aol.com": ["Mobile", "Android; Mobile"],
-    "alipay.com": ["Mobile", "Android; Mobile"],
-    "dailymotion.com": ["Mobile", "Android; Mobile Safari"],
-    "amazon.co.uk": ["Mobile", "Android; Mobile"],
-    "ebay.co.uk": ["Mobile", "Android; Mobile"],
-
-    "facebook.com": [/Mobile\) WebKit\/([.0-9]*)/, "Linux) WebKit/$1 (like Android 4.3) AppleWebKit/$1 Ubuntu Mobile"],
-    // Akamai serves images for Facebook
-    "akamaihd.net": [/Mobile\) WebKit\/([.0-9]*)/, "Linux) WebKit/$1 (like Android 4.3) AppleWebKit/$1 Ubuntu Mobile"],
-
-    "nytimes.com": ["Mobile", "Android; Mobile Safari"],
-
-    // http://pad.lv/1223937
-    "huffpost.com": ["Mobile)", "Mobile) Firefox"],
-};

=== modified file 'src/Ubuntu/Web/plugin.cpp'
--- src/Ubuntu/Web/plugin.cpp	2015-02-27 10:08:05 +0000
+++ src/Ubuntu/Web/plugin.cpp	2015-04-09 13:12:19 +0000
@@ -181,14 +181,6 @@
     return m_devtoolsPort;
 }
 
-static float getQtWebkitDpr()
-{
-    QByteArray stringValue = qgetenv("QTWEBKIT_DPR");
-    bool ok = false;
-    float value = stringValue.toFloat(&ok);
-    return ok ? value : 1.0;
-}
-
 void UbuntuBrowserPlugin::initializeEngine(QQmlEngine* engine, const char* uri)
 {
     Q_UNUSED(uri);
@@ -196,11 +188,6 @@
     QQmlContext* context = engine->rootContext();
     context->setContextObject(new UbuntuWebPluginContext(context));
 
-    if (uri == QLatin1String("Ubuntu.Components.Extras.Browser")) {
-        // Set the desired pixel ratio (not needed once we use Qt’s way of
-        // calculating the proper pixel ratio by device/screen).
-        context->setContextProperty("QtWebKitDPR", getQtWebkitDpr());
-    }
 }
 
 void UbuntuBrowserPlugin::registerTypes(const char* uri)

=== modified file 'src/app/BrowserWindow.qml'
--- src/app/BrowserWindow.qml	2015-03-25 08:51:42 +0000
+++ src/app/BrowserWindow.qml	2015-04-09 13:12:19 +0000
@@ -39,7 +39,6 @@
 
     Connections {
         target: window.currentWebview
-        ignoreUnknownSignals: true
         onFullscreenChanged: {
             if (!window.forceFullscreen) {
                 if (window.currentWebview.fullscreen) {

=== removed file 'src/app/PermissionRequest.qml'
--- src/app/PermissionRequest.qml	2014-07-29 21:51:07 +0000
+++ src/app/PermissionRequest.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright 2013-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 1.1
-import Ubuntu.Components.Popups 1.0
-
-Dialog {
-    id: dialog
-
-    property QtObject permission: null
-
-    title: i18n.tr("Permission Request")
-
-    Button {
-        text: i18n.tr("Deny")
-        color: UbuntuColors.warmGrey
-        onClicked: {
-            permission.allow = false
-            PopupUtils.close(dialog)
-        }
-    }
-
-    Button {
-        text: i18n.tr("Allow")
-        color: UbuntuColors.orange
-        onClicked: {
-            permission.allow = true
-            PopupUtils.close(dialog)
-        }
-    }
-}

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2015-03-31 14:57:20 +0000
+++ src/app/webcontainer/WebApp.qml	2015-04-09 13:12:19 +0000
@@ -33,7 +33,6 @@
 
     property string webappModelSearchPath: ""
 
-    property alias oxide: webview.withOxide
     property alias webappName: webview.webappName
     property alias webappUrlPatterns: webview.webappUrlPatterns
     property alias popupRedirectionUrlPrefixPattern: webview.popupRedirectionUrlPrefixPattern
@@ -73,7 +72,6 @@
                 left: parent.left
                 right: parent.right
                 top: parent.top
-                topMargin: (webapp.oxide || webapp.chromeless) ? 0 : chromeLoader.item.height
             }
             height: parent.height - osk.height
             developerExtrasEnabled: webapp.developerExtrasEnabled
@@ -82,7 +80,7 @@
         Loader {
             anchors {
                 fill: webview
-                topMargin: (webapp.oxide && !webapp.chromeless && chromeLoader.item.state == "shown") ? chromeLoader.item.height : 0
+                topMargin: (!webapp.chromeless && chromeLoader.item.state == "shown") ? chromeLoader.item.height : 0
             }
             sourceComponent: ErrorSheet {
                 visible: webview.currentWebview && webview.currentWebview.lastLoadFailed
@@ -118,7 +116,7 @@
                         right: parent.right
                     }
                     height: units.gu(6)
-                    y: (webapp.oxide && webapp.currentWebview) ? webview.currentWebview.locationBarController.offset : 0
+                    y: webapp.currentWebview ? webview.currentWebview.locationBarController.offset : 0
                 }
             }
 
@@ -138,32 +136,23 @@
         }
 
         Binding {
-            when: webapp.oxide && webapp.currentWebview && !webapp.chromeless
-            target: (webapp.oxide && webapp.currentWebview) ? webapp.currentWebview.locationBarController : null
+            when: webapp.currentWebview && !webapp.chromeless
+            target: webapp.currentWebview ? webapp.currentWebview.locationBarController : null
             property: 'height'
             value: webapp.currentWebview.visible ? chromeLoader.item.height : 0
         }
 
-        Loader {
+        ChromeController {
             id: oxideChromeController
-
-            sourceComponent: webapp.oxide ? oxideChromeControllerComponent : undefined
-
-            Component {
-                id: oxideChromeControllerComponent
-
-                ChromeController {
-                    webview: webapp.currentWebview
-                    forceHide: webapp.chromeless
-                }
-            }
+            webview: webapp.currentWebview
+            forceHide: webapp.chromeless
         }
 
         Binding {
-            when: webapp.oxide && webapp.currentWebview
-            target: (webapp.oxide && webapp.currentWebview) ? webapp.currentWebview.locationBarController : null
+            when: webapp.currentWebview
+            target: webapp.currentWebview ? webapp.currentWebview.locationBarController : null
             property: 'mode'
-            value: webapp.oxide ? oxideChromeController.item.mode : 0
+            value: oxideChromeController.mode
         }
     }
 

=== removed file 'src/app/webcontainer/WebViewImplWebkit.qml'
--- src/app/webcontainer/WebViewImplWebkit.qml	2015-01-23 15:13:04 +0000
+++ src/app/webcontainer/WebViewImplWebkit.qml	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
-/*
- * Copyright 2013-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 QtWebKit 3.1
-import QtWebKit.experimental 1.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Extras.Browser 0.1
-import Ubuntu.UnityWebApps 0.1 as UnityWebApps
-import Ubuntu.Components.Popups 1.0
-import "../actions" as Actions
-import ".."
-
-UbuntuWebView {
-    id: webview
-
-    property bool developerExtrasEnabled: false
-    property var currentWebview: webview
-    property string webappName: ""
-    property var webappUrlPatterns: null
-    property string localUserAgentOverride: ""
-    property string popupRedirectionUrlPrefixPattern: ""
-    property url dataPath // unused
-    property bool runningLocalApplication: false
-
-    function getUAString() {
-        return webview.localUserAgentOverride.length === 0 ? undefined : webview.localUserAgentOverride
-    }
-
-    experimental.certificateVerificationDialog: CertificateVerificationDialog {}
-    experimental.authenticationDialog: AuthenticationDialog {}
-    experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}
-    experimental.alertDialog: AlertDialog {}
-    experimental.confirmDialog: ConfirmDialog {}
-    experimental.promptDialog: PromptDialog {}
-
-    selectionActions: ActionList {
-        Actions.Copy {
-            onTriggered: selection.copy()
-        }
-    }
-
-    StateSaver.properties: "url"
-    StateSaver.enabled: true
-
-    property bool lastLoadFailed: false
-    onLoadingChanged: {
-        lastLoadFailed = (loadRequest.status === WebView.LoadFailedStatus)
-    }
-
-    experimental.preferences.developerExtrasEnabled: developerExtrasEnabled
-
-    experimental.onPermissionRequested: {
-        if (permission.type === PermissionRequest.Geolocation) {
-            var text = i18n.tr("This page wants to know your device’s location.")
-            PopupUtils.open(Qt.resolvedUrl("../PermissionRequest.qml"),
-                            webview.currentWebview,
-                            {"permission": permission, "text": text})
-        }
-        // TODO: handle other types of permission requests
-        // TODO: we might want to store the answer to avoid requesting
-        //       the permission everytime the user visits this site.
-    }
-
-    contextualActions: ActionList {
-        Actions.CopyLink {
-            enabled: webview.contextualData.href.toString()
-            onTriggered: Clipboard.push([webview.contextualData.href])
-        }
-        Actions.CopyImage {
-            enabled: webview.contextualData.img.toString()
-            onTriggered: Clipboard.push([webview.contextualData.img])
-        }
-    }
-
-    function isRunningAsANamedWebapp() {
-        return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
-    }
-
-    function haveValidUrlPatterns() {
-        return webappUrlPatterns && webappUrlPatterns.length !== 0
-    }
-
-    function shouldAllowNavigationTo(url) {
-        // The list of url patterns defined by the webapp takes precedence over command line
-        if (isRunningAsANamedWebapp()) {
-            if (unityWebapps.model.exists(unityWebapps.name) &&
-                unityWebapps.model.doesUrlMatchesWebapp(unityWebapps.name, url)) {
-                return true;
-            }
-        }
-
-        // We still take the possible additional patterns specified in the command line
-        // (the in the case of finer grained ones specifically for the container and not
-        // as an 'install source' for the webapp).
-        if (webappUrlPatterns && webappUrlPatterns.length !== 0) {
-            for (var i = 0; i < webappUrlPatterns.length; ++i) {
-                var pattern = webappUrlPatterns[i]
-                if (url.match(pattern)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    function navigationRequestedDelegate(request) {
-        if (!request.isMainFrame) {
-            request.action = WebView.AcceptRequest
-            return
-        }
-
-        // Pass-through if we are not running as a named webapp (--webapp='Gmail')
-        // or if we dont have a list of url patterns specified to filter the
-        // browsing actions
-        if ( ! haveValidUrlPatterns() && ! isRunningAsANamedWebapp()) {
-            request.action = WebView.AcceptRequest
-            return
-        }
-
-        var action = WebView.IgnoreRequest
-        var url = request.url.toString()
-
-        if (shouldAllowNavigationTo(url)) {
-            request.action = WebView.AcceptRequest
-            return;
-        }
-
-        request.action = action
-        if (action === WebView.IgnoreRequest) {
-            console.debug('Opening: ' + url + ' in the browser window.')
-            Qt.openUrlExternally(url)
-        }
-    }
-
-    onNewTabRequested: Qt.openUrlExternally(url)
-
-    // Small shim needed when running as a webapp to wire-up connections
-    // with the webview (message received, etc…).
-    // This is being called (and expected) internally by the webapps
-    // component as a way to bind to a webview lookalike without
-    // reaching out directly to its internals (see it as an interface).
-    function getUnityWebappsProxies() {
-        var eventHandlers = {
-            onAppRaised: function () {
-                if (webbrowserWindow) {
-                    try {
-                        webbrowserWindow.raise();
-                    } catch (e) {
-                        console.debug('Error while raising: ' + e);
-                    }
-                }
-            }
-        };
-        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview, eventHandlers)
-    }
-}

=== modified file 'src/app/webcontainer/WebappContainerWebview.qml'
--- src/app/webcontainer/WebappContainerWebview.qml	2014-11-25 15:00:45 +0000
+++ src/app/webcontainer/WebappContainerWebview.qml	2015-04-09 13:12:19 +0000
@@ -27,7 +27,6 @@
     id: containerWebview
 
     property string url: ""
-    property bool withOxide: false
     property bool developerExtrasEnabled: false
     property string webappName: ""
     property url dataPath
@@ -50,10 +49,7 @@
     onUrlChanged: if (webappContainerWebViewLoader.item) webappContainerWebViewLoader.item.url = url
 
     Component.onCompleted: {
-        var webappEngineSource =
-                withOxide ?
-                    Qt.resolvedUrl("WebViewImplOxide.qml")
-                  : Qt.resolvedUrl("WebViewImplWebkit.qml");
+        var webappEngineSource = Qt.resolvedUrl("WebViewImplOxide.qml");
 
         // This is an experimental, UNSUPPORTED, API
         // It loads an alternative webview, adjusted for a specific webapp

=== modified file 'src/app/webcontainer/webapp-container.cpp'
--- src/app/webcontainer/webapp-container.cpp	2015-02-27 09:28:41 +0000
+++ src/app/webcontainer/webapp-container.cpp	2015-04-09 13:12:19 +0000
@@ -75,33 +75,6 @@
     }
 }
 
-static QString currentArchitecturePathName()
-{
-#if defined(Q_PROCESSOR_X86_32)
-    return QLatin1String("i386-linux-gnu");
-#elif defined(Q_PROCESSOR_X86_64)
-    return QLatin1String("x86_64-linux-gnu");
-#elif defined(Q_PROCESSOR_ARM)
-    return QLatin1String("arm-linux-gnueabihf");
-#else
-#error Unable to determine target architecture
-#endif
-}
-
-static bool canUseOxide()
-{
-    // Use a runtime hint to transparently know if oxide
-    // can be used as a backend without the user/dev having
-    // to update its app or change something in the Exec args.
-    // Version 1.1 of ubuntu apparmor policy allows this file to
-    // be accessed whereas v1.0 only knows about qtwebkit.
-    QString oxideHintLocation =
-        QString("/usr/lib/%1/oxide-qt/oxide-renderer")
-            .arg(currentArchitecturePathName());
-
-    return QFile(oxideHintLocation).open(QIODevice::ReadOnly);
-}
-
 }
 
 const QString WebappContainer::URL_PATTERN_SEPARATOR = ",";
@@ -110,7 +83,6 @@
 
 WebappContainer::WebappContainer(int& argc, char** argv):
     BrowserApplication(argc, argv),
-    m_withOxide(canUseOxide()),
     m_storeSessionCookies(false),
     m_backForwardButtonsVisible(false),
     m_addressBarVisible(false),
@@ -146,9 +118,6 @@
         m_window->setProperty("chromeVisible", m_addressBarVisible);
         m_window->setProperty("accountProvider", m_accountProvider);
 
-        qDebug() << "Using" << (m_withOxide ? "Oxide" : "QtWebkit") << "as the web engine backend";
-        m_window->setProperty("oxide", m_withOxide);
-
         m_window->setProperty("webappUrlPatterns", m_webappUrlPatterns);
         QQmlContext* context = m_engine->rootContext();
         if (m_storeSessionCookies) {
@@ -310,13 +279,7 @@
 void WebappContainer::parseCommandLine()
 {
     Q_FOREACH(const QString& argument, m_arguments) {
-        if (argument == "--webkit") {
-            // force webkit
-            m_withOxide = false;
-        } else if (argument == "--oxide") {
-            // force oxide
-            m_withOxide = true;
-        } else if (argument.startsWith("--webappModelSearchPath=")) {
+        if (argument.startsWith("--webappModelSearchPath=")) {
             m_webappModelSearchPath = argument.split("--webappModelSearchPath=")[1];
         } else if (argument.startsWith("--webapp=")) {
             // We use the name as a reference instead of the URL with a subsequent step to match it with a webapp.

=== modified file 'src/app/webcontainer/webapp-container.h'
--- src/app/webcontainer/webapp-container.h	2015-01-26 14:53:18 +0000
+++ src/app/webcontainer/webapp-container.h	2015-04-09 13:12:19 +0000
@@ -60,7 +60,6 @@
     QString m_webappModelSearchPath;
     QStringList m_webappUrlPatterns;
     QString m_accountProvider;
-    bool m_withOxide;
     bool m_storeSessionCookies;
     bool m_backForwardButtonsVisible;
     bool m_addressBarVisible;

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2015-02-02 13:55:49 +0000
+++ src/app/webcontainer/webapp-container.qml	2015-04-09 13:12:19 +0000
@@ -37,7 +37,6 @@
     property string webappName: ""
     property string webappModelSearchPath: ""
     property var webappUrlPatterns
-    property bool oxide: false
     property string accountProvider: ""
     property string popupRedirectionUrlPrefixPattern: ""
     property url webviewOverrideFile: ""
@@ -82,7 +81,6 @@
             chromeVisible: root.chromeVisible
             backForwardButtonsVisible: root.backForwardButtonsVisible
             developerExtrasEnabled: root.developerExtrasEnabled
-            oxide: root.oxide
             webappModelSearchPath: root.webappModelSearchPath
             webappUrlPatterns: root.webappUrlPatterns
             blockOpenExternalUrls: root.blockOpenExternalUrls
@@ -240,7 +238,7 @@
 
         // check if we are to display the login view
         // or directly switch to the webapp view
-        if (accountProvider.length !== 0 && oxide) {
+        if (accountProvider.length !== 0) {
             loadLoginView();
         } else {
             loadWebAppView();

=== removed file 'tests/unittests/qml/tst_UbuntuWebView01.qml'
--- tests/unittests/qml/tst_UbuntuWebView01.qml	2014-03-17 10:16:11 +0000
+++ tests/unittests/qml/tst_UbuntuWebView01.qml	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright 2013 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 QtTest 1.0
-import Ubuntu.Components.Extras.Browser 0.1
-
-TestCase {
-    name: "UbuntuWebView"
-
-    function test_custom_UA_override() {
-        compare(webview1.getUAString(), undefined)
-        // passing a 'url' parameter to getUAString()
-        // (as was the API before) shouldn’t hurt:
-        compare(webview1.getUAString("http://example.com"), undefined)
-        verify(webview1.experimental.userAgent !== undefined)
-        compare(webview2.experimental.userAgent, "custom UA")
-    }
-
-    UbuntuWebView {
-        id: webview1
-    }
-
-    UbuntuWebView {
-        id: webview2
-
-        function getUAString(url) {
-            return "custom UA"
-        }
-    }
-}

=== removed file 'tests/unittests/qml/tst_UserAgent01.qml'
--- tests/unittests/qml/tst_UserAgent01.qml	2014-11-11 17:50:16 +0000
+++ tests/unittests/qml/tst_UserAgent01.qml	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright 2013 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 QtTest 1.0
-
-TestCase {
-    name: "UserAgent"
-
-    function test_get_domain_data() {
-        return [
-            {url: "http://ubuntu.com", domain: "ubuntu.com"},
-            {url: "http://www.ubuntu.com", domain: "www.ubuntu.com"},
-            {url: "http://ubuntu.com/", domain: "ubuntu.com"},
-            {url: "http://www.ubuntu.com/", domain: "www.ubuntu.com"},
-            {url: "ubuntu.com", domain: "ubuntu.com"},
-            {url: "ubuntu.com/", domain: "ubuntu.com"},
-            {url: "ubuntu.com/phone", domain: "ubuntu.com"},
-            {url: "http://ubuntu.com/phone", domain: "ubuntu.com"},
-            {url: "www.ubuntu.com/phone", domain: "www.ubuntu.com"},
-            {url: "http://ubuntu.com/phone/index.html", domain: "ubuntu.com"},
-            {url: "ubuntu.com/phone/index.html", domain: "ubuntu.com"},
-            {url: "www.ubuntu.com/phone/index.html", domain: "www.ubuntu.com"},
-            {url: "http://ubuntu.com/phone/index.html?foo=bar&baz=bleh", domain: "ubuntu.com"},
-        ]
-    }
-    function test_get_domain(data) {
-        compare(userAgent.getDomain(data.url), data.domain)
-    }
-
-    function test_get_domains_data() {
-        return [
-            {domain: "ubuntu.com", domains: ["ubuntu.com", "com"]},
-            {domain: "test.example.org", domains: ["test.example.org", "example.org", "org"]},
-        ]
-    }
-    function test_get_domains(data) {
-        compare(userAgent.getDomains(data.domain), data.domains)
-    }
-
-    function test_get_ua_string_data() {
-        return [
-            {url: "http://ubuntu.com", ua: userAgent.defaultUA},
-            {url: "http://example.org", ua: "full override"},
-            {url: "http://example.com/test", ua: "Mozilla/5.0 (Ubuntu Edge; Mobile) WebKit/537.21"},
-            {url: "http://www.google.com/", ua: "Mozilla/5.0 (Ubuntu; ble) WebKit/537.21"},
-            {url: "https://mail.google.com/", ua: "Mozilla/5.0 (Ubuntu; Touch) WebKit/537.21"},
-        ]
-    }
-    function test_get_ua_string(data) {
-        compare(userAgent.getUAString(data.url), data.ua)
-    }
-
-    readonly property Item userAgent: loader.item
-    Loader {
-        id: loader
-        source: Qt.resolvedUrl("../../../src/Ubuntu/Components/Extras/Browser/UserAgent01.qml")
-        onLoaded : {
-            item.defaultUA = "Mozilla/5.0 (Ubuntu; Mobile) WebKit/537.21"
-            item.overrides = {
-                "example.org": "full override",
-                "example.com": ["Ubuntu", "Ubuntu Edge"],
-                "google.com": [/mobi/i, "b"],
-                "mail.google.com": [/mobile/i, "Touch"],
-            }
-        }
-    }
-}