Merge lp:~mardy/webapps-core/saml-1614126 into lp:webapps-core

[Alberto Mardegan]

Fix Google+ authentication and "unsupported browser" message

Update the classes copied from webbrowser-app, change the User-Agent.

Fix Google+ authentication and "unsupported browser" message

Update the classes copied from webbrowser-app, change the User-Agent.

[lp:~mardy/webapps-core/saml-1614126]

147. By Alberto Mardegan on 2016-12-02

Bump version number

Unmerged revisions

147. By Alberto Mardegan on 2016-12-02

Bump version number

146. By Alberto Mardegan on 2016-12-01

Specify user agent for Google plus

Works around https://bugs.launchpad.net/ubuntu/+source/webbrowser-app/+bug/1644585

145. By Alberto Mardegan on 2016-11-24

Update webcontainer components

144. By Alberto Mardegan on 2016-11-23

Reuse webview from the webapp container

=== modified file 'webapp-googleplus/lib/AlertDialog.qml'
--- webapp-googleplus/lib/AlertDialog.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/AlertDialog.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,14 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 ModalDialog {
+    objectName: "alertDialog"
     title: i18n.tr("JavaScript Alert")
 
     Button {
         text: i18n.tr("OK")
+        color: theme.palette.normal.positive
+        objectName: "okButton"
         onClicked: model.accept()
     }
 }

=== modified file 'webapp-googleplus/lib/BeforeUnloadDialog.qml'
--- webapp-googleplus/lib/BeforeUnloadDialog.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/BeforeUnloadDialog.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,18 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 ModalDialog {
+    objectName: "beforeUnloadDialog"
     title: i18n.tr("Confirm Navigation")
 
     Button {
         text: i18n.tr("Leave")
+        color: theme.palette.normal.negative
+        objectName: "leaveButton"
         onClicked: model.accept()
     }
 
     Button {
+        objectName: "stayButton"
         text: i18n.tr("Stay")
         onClicked: model.reject()
     }

=== modified file 'webapp-googleplus/lib/ConfirmDialog.qml'
--- webapp-googleplus/lib/ConfirmDialog.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/ConfirmDialog.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,18 +16,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 ModalDialog {
+    objectName: "confirmDialog"
     title: i18n.tr("JavaScript Confirmation")
 
     Button {
         text: i18n.tr("OK")
+        color: theme.palette.normal.positive
+        objectName: "okButton"
         onClicked: model.accept()
     }
 
     Button {
+        objectName: "cancelButton"
         text: i18n.tr("Cancel")
         onClicked: model.reject()
     }

=== added file 'webapp-googleplus/lib/ContentHandler.qml'
--- webapp-googleplus/lib/ContentHandler.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/ContentHandler.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 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.4
+import Ubuntu.Content 1.3
+import "MimeTypeMapper.js" as MimeTypeMapper
+
+Item {
+    signal exportFromDownloads(var transfer, var mimetypeFilter, bool multiSelect)
+
+    Connections {
+        target: ContentHub
+        onExportRequested: {
+            exportFromDownloads(transfer,
+                                MimeTypeMapper.mimeTypeRegexForContentType(transfer.contentType),
+                                transfer.selectionType === ContentTransfer.Multiple)
+            
+        }
+    }
+}

=== modified file 'webapp-googleplus/lib/Downloader.qml'
--- webapp-googleplus/lib/Downloader.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/Downloader.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,62 +16,52 @@
  * 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
-import Ubuntu.DownloadManager 0.1
-import Ubuntu.Content 0.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.DownloadManager 1.2
+import Ubuntu.Content 1.3
 import "MimeTypeMapper.js" as MimeTypeMapper
 import "FileExtensionMapper.js" as FileExtensionMapper
 
 Item {
     id: downloadItem
 
-    Component {
-        id: downloadDialog
-        ContentDownloadDialog { }
-    }
+    property string filename
+    property string mimeType
+
+    signal showDownloadDialog(string downloadId, var contentType, var downloader, string filename, string mimeType)
 
     Component {
         id: metadataComponent
-        Metadata {
-            showInIndicator: true
-        }
+        Metadata {}
     }
 
     Component {
         id: downloadComponent
         SingleDownload {
+            id: downloader
             autoStart: false
             property var contentType
+            property string url
+
             onDownloadIdChanged: {
-                PopupUtils.open(downloadDialog, downloadItem, {"contentType" : contentType, "downloadId" : downloadId})
-            }
-
-            onFinished: {
-                metadata.destroy()
-                destroy()
+                showDownloadDialog(downloadId, contentType, downloader, downloadItem.filename, downloadItem.mimeType)
             }
         }
     }
 
     function download(url, contentType, headers, metadata) {
-        var singleDownload = downloadComponent.createObject(downloadItem)
-        singleDownload.contentType = contentType
-        if (headers) { 
-            singleDownload.headers = headers
+        var properties = {'contentType': contentType, 'metadata': metadata, 'url': url}
+        if (headers) {
+            properties['headers'] = headers
         }
-        singleDownload.metadata = metadata
+        var singleDownload = downloadComponent.createObject(downloadItem, properties)
         singleDownload.download(url)
     }
 
-    function downloadPicture(url, headers) {
-        var metadata = metadataComponent.createObject(downloadItem)
-        download(url, ContentType.Pictures, headers, metadata)
-    }
-
-    function downloadMimeType(url, mimeType, headers, filename) {
-        var metadata = metadataComponent.createObject(downloadItem)
+    function downloadMimeType(url, mimeType, headers, filename, incognito) {
+        var metadata = metadataComponent.createObject(downloadItem, {"showInIndicator": !incognito})
         var contentType = MimeTypeMapper.mimeTypeToContentType(mimeType)
         if (contentType == ContentType.Unknown && filename) {
             // If we can't determine the content type from the mime-type
@@ -86,12 +76,16 @@
             contentType = ContentType.Music
             metadata.extract = true
         }
+        if (!filename) {
+            filename = url.toString().split("/").pop()
+        }
         metadata.title = filename
+        downloadItem.filename = filename
+        downloadItem.mimeType = mimeType
         download(url, contentType, headers, metadata)
     }
 
     function is7digital(url) {
         return url.toString().search(/[^\/]+:\/\/[^\/]*7digital.com\//) !== -1
     }
-
 }

=== modified file 'webapp-googleplus/lib/FileExtensionMapper.js'
--- webapp-googleplus/lib/FileExtensionMapper.js	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/FileExtensionMapper.js	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -15,15 +15,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+'use strict';
+
+function getExtension(filename) {
+    var filenameParts = filename.split(".");
+    if (filenameParts.length === 1 || (filenameParts[0] === "" && filenameParts.length === 2)) {
+        return ""
+    }
+    return filenameParts.pop().toLowerCase();
+}
 
 // Constructed from /etc/mime.types
 function filenameToContentType(filename) {
-    var filenameParts = filename.split(".");
-    if(filenameParts.length === 1 || (filenameParts[0] === "" && filenameParts.length === 2)) {
-        return ContentType.Unknown;
-    }
-    var ext = filenameParts.pop().toLowerCase();
-    switch(ext) {
+    switch(getExtension(filename)) {
         case "art":
         case "bmp":
         case "cdr":
@@ -156,6 +160,8 @@
         case "cxx":
         case "d":
         case "diff":
+        case "doc":
+        case "docx":
         case "etx":
         case "gcd":
         case "h":
@@ -176,6 +182,9 @@
         case "ly":
         case "mml":
         case "moc":
+        case "odp":
+        case "ods":
+        case "odt":
         case "p":
         case "pas":
         case "patch":
@@ -183,6 +192,8 @@
         case "pl":
         case "pm":
         case "pot":
+        case "ppt":
+        case "pptx":
         case "py":
         case "rtx":
         case "scala":
@@ -205,7 +216,16 @@
         case "wml":
         case "wmls":
         case "wsc":
+        case "xls":
+        case "xlsx":
             return ContentType.Documents;
+        case "epub":
+        case "mobi":
+        case "lit":
+        case "fb2":
+        case "azw":
+        case "tpz":
+            return ContentType.EBooks;
         default:
             return ContentType.Unknown;
     }

=== modified file 'webapp-googleplus/lib/MimeTypeMapper.js'
--- webapp-googleplus/lib/MimeTypeMapper.js	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/MimeTypeMapper.js	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -18,20 +18,54 @@
 
 
 function mimeTypeToContentType(mimeType) {
-    if(mimeType.search("image/") === 0) {
-        return ContentType.Pictures;
-    } else if(mimeType.search("audio/") === 0) {
-        return ContentType.Music;
-    } else if(mimeType.search("video/") === 0) {
-        return ContentType.Videos;
-    } else if(mimeType.search("text/x-vcard") === 0) {
-        return ContentType.Contacts;
-    } else if(mimeType.search("text/") === 0
-              || mimeType.search("application/pdf") === 0
-              || mimeType.search("application/x-pdf") === 0
-              || mimeType.search("application/vnd.pdf") === 0) {
-        return ContentType.Documents;
+    if (mimeType.search("image/") === 0) {
+        return ContentType.Pictures
+    } else if (mimeType.search("audio/") === 0) {
+        return ContentType.Music
+    } else if (mimeType.search("video/") === 0) {
+        return ContentType.Videos
+    } else if (mimeType.search("text/x-vcard") === 0
+               || mimeType.search("text/vcard") === 0) {
+        return ContentType.Contacts
+    } else if (mimeType.search("application/epub[+]zip") === 0
+               || mimeType.search("application/vnd\.amazon\.ebook") === 0
+               || mimeType.search("application/x-mobipocket-ebook") === 0
+               || mimeType.search("application/x-fictionbook+xml") === 0
+               || mimeType.search("application/x-ms-reader") === 0) {
+        return ContentType.EBooks
+    } else if (mimeType.search("text/") === 0
+               || mimeType.search("application/pdf") === 0
+               || mimeType.search("application/x-pdf") === 0
+               || mimeType.search("application/vnd\.pdf") === 0
+               || mimeType.search("application/vnd\.oasis\.opendocument") === 0
+               || mimeType.search("application/msword") === 0
+               || mimeType.search("application/vnd\.openxmlformats-officedocument\.wordprocessingml\.document") === 0
+               || mimeType.search("application/vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet") === 0
+               || mimeType.search("application/vnd\.openxmlformats-officedocument\.presentationml\.presentation") === 0
+               || mimeType.search("application/vnd\.ms-excel") === 0
+               || mimeType.search("application/vnd\.ms-powerpoint") === 0) {
+        return ContentType.Documents
     } else {
-        return ContentType.Unknown;
+        return ContentType.Unknown
+    }
+}
+
+function mimeTypeRegexForContentType(contentType) {
+    switch (contentType) {
+        case ContentType.Pictures:
+            return /image\/.*/;
+        case ContentType.Music:
+            return /audio\/.*/;
+        case ContentType.Videos:
+            return /video\/.*/;
+        case ContentType.Contacts:
+            return /text\/(x-vcard|vcard)/;
+        case ContentType.EBooks:
+            return /application\/(epub.*|vnd.amazon.ebook|x-mobipocket-ebook|x-fictionbook+xml|x-ms-reader)/;
+        case ContentType.Documents:
+            return /(text\/.*|application\/pdf|application\/x-pdf|application\/vnd\.pdf|application\/vnd\.oasis\.opendocument.*|application\/msword|application\/vnd\.openxmlformats-officedocument\.wordprocessingml\.document|application\/vnd\.openxmlformats-officedocument\.spreadsheetml\.sheet|application\/vnd\.openxmlformats-officedocument\.presentationml\.presentation|application\/vnd\.ms-excel|application\/vnd\.ms-powerpoint)/;
+        case ContentType.Unknown:
+        case ContentType.All:
+            return /.*/;
     }
 }

=== modified file 'webapp-googleplus/lib/ModalDialog.qml'
--- webapp-googleplus/lib/ModalDialog.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/ModalDialog.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0 as Popups
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
 
 Popups.Dialog {
     text: model.message

=== modified file 'webapp-googleplus/lib/PromptDialog.qml'
--- webapp-googleplus/lib/PromptDialog.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/PromptDialog.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,27 +16,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 ModalDialog {
+    objectName: "promptDialog"
     title: i18n.tr("JavaScript Prompt")
 
     TextField {
         id: input
+        objectName: "inputTextField"
         text: model.defaultValue
         onAccepted: model.accept(input.text)
     }
 
     Button {
         text: i18n.tr("OK")
-        color: "green"
+        color: theme.palette.normal.positive
+        objectName: "okButton"
         onClicked: model.accept(input.text)
     }
 
     Button {
+        objectName: "cancelButton"
         text: i18n.tr("Cancel")
-        color: UbuntuColors.coolGrey
         onClicked: model.reject()
     }
 

=== modified file 'webapp-googleplus/lib/WebViewImpl.qml'
--- webapp-googleplus/lib/WebViewImpl.qml	2016-02-10 15:23:59 +0000
+++ webapp-googleplus/lib/WebViewImpl.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,53 +16,76 @@
  * 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
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
 import Ubuntu.Web 0.2
-import "../actions" as Actions
+import webbrowsercommon.private 0.1
+import "actions" as Actions
 
 WebView {
     id: webview
 
     property var currentWebview: webview
-    property var certificateError
-    // Invalid certificates the user has explicitly allowed for this session
-    property var allowedCertificates: []
 
     /*experimental.certificateVerificationDialog: CertificateVerificationDialog {}
-    experimental.authenticationDialog: AuthenticationDialog {}
     experimental.proxyAuthenticationDialog: ProxyAuthenticationDialog {}*/
     alertDialog: AlertDialog {}
     confirmDialog: ConfirmDialog {}
     promptDialog: PromptDialog {}
     beforeUnloadDialog: BeforeUnloadDialog {}
-    filePicker: contentPickerLoader.item || filePickerLoader.item
+
+    signal showDownloadDialog(string downloadId, var contentType, var downloader, string filename, string mimeType)
+
+    QtObject {
+        id: internal
+
+        readonly property var downloadMimeTypesBlacklist: [
+            "application/x-shockwave-flash", // http://launchpad.net/bugs/1379806
+        ]
+    }
+
+    onFullscreenRequested: webview.fullscreen = fullscreen
 
     onDownloadRequested: {
+        if (!request.suggestedFilename && request.mimeType &&
+            internal.downloadMimeTypesBlacklist.indexOf(request.mimeType) > -1) {
+            return
+        }
+
         if (downloadLoader.status == Loader.Ready) {
             var headers = { }
-            if(request.cookies.length > 0) {
+            if (request.cookies.length > 0) {
                 headers["Cookie"] = request.cookies.join(";")
             }
-            if(request.referrer) {
+            if (request.referrer) {
                 headers["Referer"] = request.referrer
             }
             headers["User-Agent"] = webview.context.userAgent
-            downloadLoader.item.downloadMimeType(request.url, request.mimeType, headers, request.suggestedFilename)
+            // Work around https://launchpad.net/bugs/1487090 by guessing the mime type
+            // from the suggested filename or URL if oxide hasn’t provided one, or if
+            // the server has provided the generic application/octet-stream mime type.
+            var mimeType = request.mimeType
+            if (!mimeType || mimeType == "application/octet-stream") {
+                mimeType = MimeDatabase.filenameToMimeType(request.suggestedFilename)
+            }
+            if (!mimeType) {
+                var scheme = request.url.toString().split('://').shift().toLowerCase()
+                var filename = request.url.toString().split('/').pop().split('?').shift()
+                if ((scheme == "file") || (filename.indexOf('.') > -1)) {
+                    mimeType = MimeDatabase.filenameToMimeType(filename)
+                }
+            }
+            downloadLoader.item.downloadMimeType(request.url, mimeType, headers, request.suggestedFilename, incognito)
+        } else {
+            // Desktop form factor case
+            Qt.openUrlExternally(request.url)
         }
     }
 
-    Loader {
-        id: contentPickerLoader
-        source: "ContentPickerDialog.qml"
-        asynchronous: true
-    }
-
-    Loader {
-        id: filePickerLoader
-        source: "FilePickerDialog.qml"
-        asynchronous: true
+    onHttpAuthenticationRequested: {
+        PopupUtils.open(Qt.resolvedUrl("HttpAuthenticationDialog.qml"),
+                        webview.currentWebview, {"request": request})
     }
 
     Loader {
@@ -71,9 +94,10 @@
         asynchronous: true
     }
 
-    selectionActions: ActionList {
-        Actions.Copy {
-            onTriggered: copy()
+    Connections {
+        target: downloadLoader.item
+        onShowDownloadDialog: {
+            showDownloadDialog(downloadId, contentType, downloader, filename, mimeType)
         }
     }
 
@@ -83,12 +107,4 @@
         // TODO: we might want to store the answer to avoid requesting
         //       the permission everytime the user visits this site.
     }
-
-    onCertificateError: {
-        if(webview.allowedCertificates.indexOf(error.certificate.fingerprintSHA1) != -1) {
-            error.allow()
-        } else {
-            certificateError = error
-        }
-    }
 }

=== renamed directory 'webapp-googleplus/actions' => 'webapp-googleplus/lib/actions'
=== modified file 'webapp-googleplus/lib/actions/Back.qml'
--- webapp-googleplus/actions/Back.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/Back.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
 UnityActions.Action {

=== modified file 'webapp-googleplus/lib/actions/Bookmark.qml'
--- webapp-googleplus/actions/Bookmark.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/Bookmark.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
 UnityActions.Action {

=== modified file 'webapp-googleplus/lib/actions/BookmarkLink.qml'
--- webapp-googleplus/actions/BookmarkLink.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/BookmarkLink.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Action {
     text: i18n.tr("Bookmark link")

=== modified file 'webapp-googleplus/lib/actions/ClearHistory.qml'
--- webapp-googleplus/actions/ClearHistory.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/ClearHistory.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
 UnityActions.Action {

=== modified file 'webapp-googleplus/lib/actions/Copy.qml'
--- webapp-googleplus/actions/Copy.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/Copy.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Action {
     text: i18n.tr("Copy")

=== modified file 'webapp-googleplus/lib/actions/CopyImage.qml'
--- webapp-googleplus/actions/CopyImage.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/CopyImage.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Action {
     text: i18n.tr("Copy image")

=== modified file 'webapp-googleplus/lib/actions/CopyLink.qml'
--- webapp-googleplus/actions/CopyLink.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/CopyLink.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Action {
     text: i18n.tr("Copy link")

=== added file 'webapp-googleplus/lib/actions/Cut.qml'
--- webapp-googleplus/lib/actions/Cut.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/Cut.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Cut")
+}

=== added file 'webapp-googleplus/lib/actions/Erase.qml'
--- webapp-googleplus/lib/actions/Erase.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/Erase.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Erase")
+}

=== added file 'webapp-googleplus/lib/actions/FindInPage.qml'
--- webapp-googleplus/lib/actions/FindInPage.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/FindInPage.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+import Ubuntu.Unity.Action 1.1 as UnityActions
+
+UnityActions.Action {
+    text: i18n.tr("Find in page")
+    // TRANSLATORS: This is a free-form list of keywords associated to the 'Find in Page' action.
+    // Keywords may actually be sentences, and must be separated by semi-colons.
+    keywords: i18n.tr("Search in Page")
+}

=== modified file 'webapp-googleplus/lib/actions/Forward.qml'
--- webapp-googleplus/actions/Forward.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/Forward.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
 UnityActions.Action {

=== modified file 'webapp-googleplus/lib/actions/GoTo.qml'
--- webapp-googleplus/actions/GoTo.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/GoTo.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
 UnityActions.Action {

=== modified file 'webapp-googleplus/lib/actions/NewTab.qml'
--- webapp-googleplus/actions/NewTab.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/NewTab.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
 UnityActions.Action {

=== modified file 'webapp-googleplus/lib/actions/OpenImageInNewTab.qml'
--- webapp-googleplus/actions/OpenImageInNewTab.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/OpenImageInNewTab.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Action {
     text: i18n.tr("Open image in new tab")

=== added file 'webapp-googleplus/lib/actions/OpenLinkInBrowser.qml'
--- webapp-googleplus/lib/actions/OpenLinkInBrowser.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/OpenLinkInBrowser.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open link in default browser")
+}

=== added file 'webapp-googleplus/lib/actions/OpenLinkInNewBackgroundTab.qml'
--- webapp-googleplus/lib/actions/OpenLinkInNewBackgroundTab.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/OpenLinkInNewBackgroundTab.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014-2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open link in new background tab")
+}

=== modified file 'webapp-googleplus/lib/actions/OpenLinkInNewTab.qml'
--- webapp-googleplus/actions/OpenLinkInNewTab.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/OpenLinkInNewTab.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Action {
     text: i18n.tr("Open link in new tab")

=== added file 'webapp-googleplus/lib/actions/OpenLinkInNewWindow.qml'
--- webapp-googleplus/lib/actions/OpenLinkInNewWindow.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/OpenLinkInNewWindow.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open link in new window")
+}

=== added file 'webapp-googleplus/lib/actions/OpenLinkInPrivateWindow.qml'
--- webapp-googleplus/lib/actions/OpenLinkInPrivateWindow.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/OpenLinkInPrivateWindow.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open link in private window")
+}

=== added file 'webapp-googleplus/lib/actions/OpenVideoInNewTab.qml'
--- webapp-googleplus/lib/actions/OpenVideoInNewTab.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/OpenVideoInNewTab.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Open video in new tab")
+}

=== added file 'webapp-googleplus/lib/actions/Paste.qml'
--- webapp-googleplus/lib/actions/Paste.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/Paste.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Paste")
+}

=== added file 'webapp-googleplus/lib/actions/Redo.qml'
--- webapp-googleplus/lib/actions/Redo.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/Redo.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Redo")
+}

=== modified file 'webapp-googleplus/lib/actions/Reload.qml'
--- webapp-googleplus/actions/Reload.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/Reload.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 Canonical Ltd.
+ * Copyright 2013-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 
 UnityActions.Action {

=== modified file 'webapp-googleplus/lib/actions/SaveImage.qml'
--- webapp-googleplus/actions/SaveImage.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/actions/SaveImage.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Action {
     text: i18n.tr("Save image")

=== added file 'webapp-googleplus/lib/actions/SaveLink.qml'
--- webapp-googleplus/lib/actions/SaveLink.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/SaveLink.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Save link")
+}

=== added file 'webapp-googleplus/lib/actions/SaveVideo.qml'
--- webapp-googleplus/lib/actions/SaveVideo.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/SaveVideo.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2016 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Save video")
+}

=== added file 'webapp-googleplus/lib/actions/SelectAll.qml'
--- webapp-googleplus/lib/actions/SelectAll.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/SelectAll.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Select all")
+}

=== added file 'webapp-googleplus/lib/actions/Share.qml'
--- webapp-googleplus/lib/actions/Share.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/Share.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014-2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Share")
+    iconName: "share"
+}

=== added file 'webapp-googleplus/lib/actions/Undo.qml'
--- webapp-googleplus/lib/actions/Undo.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/actions/Undo.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Action {
+    text: i18n.tr("Undo")
+}

=== added directory 'webapp-googleplus/lib/webcontainer'
=== added file 'webapp-googleplus/lib/webcontainer/AccountChooserDialog.qml'
--- webapp-googleplus/lib/webcontainer/AccountChooserDialog.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/AccountChooserDialog.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2013-2015 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.4
+import Qt.labs.settings 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
+
+SplashScreen {
+    id: root
+
+    property string providerId: ""
+    property string applicationId: ""
+    property bool accountMandatory: true
+    property var accountsModel: null
+
+    signal accountSelected(int accountId)
+    signal cancel()
+
+    property var __selectedAccount: settings.selectedAccount
+
+    Settings {
+        id: settings
+        property int selectedAccount
+    }
+
+    Setup {
+        id: setup
+        applicationId: root.applicationId
+        providerId: root.providerId
+        onFinished: {
+            if ("accountId" in reply) {
+                root.chooseAccount(reply.accountId)
+            } else {
+                root.cancel()
+            }
+        }
+    }
+
+    Column {
+        anchors { left: parent.left; right: parent.right }
+        spacing: units.gu(1)
+
+        ListItem.Caption {
+            text: i18n.tr("No accounts have been linked to this webapp; press the item below to add an account.")
+            visible: accountsModel.count === 0
+        }
+
+        Repeater {
+            model: accountsModel
+            AccountItem {
+                providerName: model.providerName
+                accountName: model.displayName
+                selected: model.accountId === root.__selectedAccount
+                onClicked: root.onConfirmed(model.accountId)
+            }
+        }
+
+        ListItem.Standard {
+            id: addAccountButton
+            text: i18n.tr("Add account")
+            iconName: "add"
+            selected: root.__selectedAccount === -1
+            onClicked: root.onConfirmed(-1)
+        }
+
+        ListItem.Standard {
+            id: skipButton
+            visible: !root.accountMandatory
+            text: i18n.tr("Don't use an account")
+            selected: root.__selectedAccount === -2
+            onClicked: root.onConfirmed(-2)
+        }
+
+        Button {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: units.gu(1)
+            text: i18n.tr("Cancel")
+            onClicked: root.cancel()
+        }
+    }
+
+    function chooseAccount(accountId) {
+        for (var i = 0; i < accountsModel.count; i++) {
+            if (accountsModel.get(i, "accountId") === accountId) {
+                settings.selectedAccount = accountId
+                root.accountSelected(accountId)
+                return
+            }
+        }
+
+        // The selected account was not found
+        settings.selectedAccount = -1
+        root.cancel()
+    }
+
+    function onConfirmed(account) {
+        if (account === -2) {
+            root.selectedAccount(0)
+        } else if (account === -1) {
+            setup.exec()
+        } else {
+            chooseAccount(account)
+        }
+    }
+}

=== added file 'webapp-googleplus/lib/webcontainer/AccountErrorScreen.qml'
--- webapp-googleplus/lib/webcontainer/AccountErrorScreen.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/AccountErrorScreen.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2015 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.4
+import Ubuntu.Components 1.3
+
+Rectangle {
+    id: root
+
+    property alias message: messageLabel.text
+    signal closed()
+
+    anchors.fill: parent
+
+    Column {
+        anchors.fill: parent
+        anchors.margins: units.gu(4)
+
+        spacing: units.gu(3)
+
+        Label {
+            width: parent.width
+            fontSize: "x-large"
+            text: i18n.tr("Account error")
+        }
+
+        Label {
+            id: messageLabel
+            width: parent.width
+            wrapMode: Text.Wrap
+        }
+
+        Button {
+            anchors.horizontalCenter: parent.horizontalCenter
+            text: i18n.tr("Close")
+            onClicked: root.closed()
+        }
+    }
+}

=== added file 'webapp-googleplus/lib/webcontainer/AccountItem.qml'
--- webapp-googleplus/lib/webcontainer/AccountItem.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/AccountItem.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013-2015 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+
+ListItem.Subtitled {
+    id: root
+
+    property string providerName
+    property string accountName
+
+    text: providerName
+    subText: accountName
+}

=== added file 'webapp-googleplus/lib/webcontainer/AccountsLogic.qml'
--- webapp-googleplus/lib/webcontainer/AccountsLogic.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/AccountsLogic.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2015 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.4
+import Qt.labs.settings 1.0
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
+import webcontainer.private 0.1
+
+Item {
+    id: root
+
+    property alias providerId: accountsModelObject.provider
+    property alias applicationId: accountsModelObject.applicationId
+    property bool accountSwitcher: false
+    property var accountsModel: accountsModelObject
+
+    signal splashScreenRequested()
+    signal errorScreenRequested(string message)
+    signal accountSelected(int credentialsId, bool willMoveCookies)
+    signal contextReady()
+    signal quitRequested()
+
+    property var __account: null
+    property int __credentialsId: __account ? __account.authData.credentialsId : 0
+
+    Timer {
+        id: checkTimer
+        running: true
+        repeat: false
+        onTriggered: checkAccounts()
+        interval: 100
+    }
+
+    AccountServiceModel {
+        id: accountsModelObject
+    }
+
+    // This is only used if accountSwitcher is false
+    Setup {
+        id: setup
+        applicationId: root.applicationId
+        providerId: root.providerId
+        onFinished: {
+            if ("accountId" in reply) {
+                root.checkAccounts()
+            } else if ("errorName" in reply) {
+                root.errorScreenRequested(i18n.tr("Account window could not be opened. You can only create one account at a time; please try again after closing all other account windows."))
+            } else {
+                root.quitRequested()
+            }
+        }
+    }
+
+    Settings {
+        id: settings
+        property int selectedAccount: -1
+        property string initializedAccounts: "[]"
+    }
+
+    Component {
+        id: accountComponent
+        AccountService { }
+    }
+
+    Component {
+        id: onlineAccountStoreComponent
+        OnlineAccountsCookieStore { }
+    }
+
+    Component {
+        id: oxideCookieStoreComponent
+        ChromeCookieStore { }
+    }
+
+    function checkAccounts() {
+        checkTimer.stop()
+        console.log("Accounts: " + accountsModel.count)
+
+        /* If account switching is not supported, we just pick the first
+         * account here. */
+        if (!accountSwitcher) {
+            if (accountsModel.count === 0) {
+                setup.exec()
+            } else {
+                settings.selectedAccount = accountsModel.get(0, "accountId")
+                setupAccount(settings.selectedAccount)
+            }
+            return
+        }
+
+        if (accountsModel.count === 0) {
+            settings.selectedAccount = -1
+        } else if (settings.selectedAccount > 0) {
+            // check that the account exists
+            for (var i = 0; i < accountsModel.count; i++) {
+                if (accountsModel.get(i, "accountId") === settings.selectedAccount) {
+                    break;
+                }
+            }
+            if (i >= accountsModel.count) {
+                // The selected account was not found
+                settings.selectedAccount = -1
+            }
+        }
+
+        if (settings.selectedAccount < 0) {
+            splashScreenRequested()
+        } else {
+            setupAccount(settings.selectedAccount)
+        }
+    }
+
+    function proceedWithNoAccount() {
+        __account = null
+        settings.selectedAccount = 0
+        accountSelected(__credentialsId, false)
+    }
+
+    function setupAccount(accountId) {
+        console.log("Setup account " + accountId)
+        if (__account && accountId === __account.accountId) {
+            console.log("Same as current account")
+            accountSelected(__credentialsId, false)
+            return
+        }
+        __account = null
+        for (var i = 0; i < accountsModel.count; i++) {
+            if (accountsModel.get(i, "accountId") === accountId) {
+                var accountHandle = accountsModel.get(i, "accountServiceHandle")
+                __account = accountComponent.createObject(root, {
+                    objectHandle: accountHandle
+                })
+                break;
+            }
+        }
+        console.log("Credentials ID: " + __credentialsId)
+        settings.selectedAccount = accountId
+        accountSelected(__credentialsId, mustMoveCookies(accountId))
+    }
+
+    function login(account, callback) {
+        console.log("Preparing for login")
+
+        function authenticatedCallback() {
+            console.log("Authenticated!")
+            account.authenticated.disconnect(authenticatedCallback)
+            callback(true)
+        }
+        account.authenticated.connect(authenticatedCallback)
+
+        function errorCallback() {
+            console.log("Authentication error!")
+            account.authenticationError.disconnect(errorCallback)
+            callback(false)
+        }
+        account.authenticationError.connect(errorCallback)
+
+        account.authenticate(null)
+    }
+
+    function mustMoveCookies(accountId) {
+        var initializedAccounts
+        try {
+            initializedAccounts = JSON.parse(settings.initializedAccounts)
+        } catch(e) {
+            initializedAccounts = []
+        }
+        return initializedAccounts.indexOf(accountId) < 0
+    }
+
+    function rememberCookiesMoved(accountId) {
+        var initializedAccounts = JSON.parse(settings.initializedAccounts)
+        if (initializedAccounts.indexOf(accountId) < 0) {
+            initializedAccounts.push(accountId)
+            settings.initializedAccounts = JSON.stringify(initializedAccounts)
+        }
+    }
+
+    function onCookiesMoved(result) {
+        if (!result) {
+            console.log("Cookies were not moved")
+        } else {
+            console.log("cookies moved")
+        }
+        // Even if the cookies were not moved, we don't want to retry
+        rememberCookiesMoved(__account.accountId)
+        contextReady()
+    }
+
+    function setupWebcontextForAccount(webcontext) {
+        if (!__account || !mustMoveCookies(__account.accountId)) {
+            contextReady()
+            return
+        }
+
+        login(__account, function(authenticated) {
+            if (!authenticated) {
+                errorScreenRequested(i18n.tr("Authentication failed"))
+            } else {
+                console.log("Authentication succeeded, moving cookies")
+                var accountsCookieStore = onlineAccountStoreComponent.createObject(root, {
+                    "accountId": __credentialsId
+                })
+
+                var webappCookieStore = oxideCookieStoreComponent.createObject(root, {
+                    "oxideStoreBackend": webcontext.cookieManager,
+                    "dbPath": webcontext.dataPath + "/cookies.sqlite"
+                })
+
+                webappCookieStore.moved.connect(onCookiesMoved)
+                webappCookieStore.moveFrom(accountsCookieStore)
+            }
+        })
+    }
+}

=== added file 'webapp-googleplus/lib/webcontainer/AccountsPage.qml'
--- webapp-googleplus/lib/webcontainer/AccountsPage.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/AccountsPage.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2013-2015 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.OnlineAccounts 0.1
+import webcontainer.private 0.1
+
+Item {
+    id: root
+
+    property alias providerId: accountsLogic.providerId
+    property alias applicationId: accountsLogic.applicationId
+    property alias accountSwitcher: accountsLogic.accountSwitcher
+    property string webappName: ""
+    property url webappIcon
+
+    signal accountSelected(string accountDataLocation, bool willMoveCookies)
+    signal contextReady()
+    signal quitRequested()
+
+    property string __providerName: providerId
+    property string __lastAccountDataLocation: ""
+
+    anchors.fill: parent
+
+    AccountsLogic {
+        id: accountsLogic
+
+        onSplashScreenRequested: showSplashScreen()
+        onAccountSelected: root.__emitAccountSelected(credentialsId, willMoveCookies)
+        onContextReady: root.contextReady()
+        onQuitRequested: root.quitRequested()
+        onErrorScreenRequested: showErrorScreen(message)
+    }
+
+    AccountsSplashScreen {
+        id: splashScreen
+
+        visible: false
+        providerName: root.__providerName
+        applicationName: root.webappName
+        iconSource: root.webappIcon
+
+        onChooseAccount: root.showAccountSwitcher()
+        onQuitRequested: root.quitRequested()
+        onSkip: accountsLogic.proceedWithNoAccount()
+    }
+
+    // Only temporarily used for bug https://bugs.launchpad.net/bugs/1441873
+    AccountErrorScreen {
+        id: errorScreen
+
+        visible: false
+        onClosed: root.quitRequested()
+    }
+
+    Loader {
+        id: accountChooserLoader
+        anchors.fill: parent
+    }
+
+    Component {
+        id: accountChooserComponent
+        AccountChooserDialog {
+            id: accountChooser
+            applicationName: root.webappName
+            iconSource: root.webappIcon
+            providerId: root.providerId
+            applicationId: root.applicationId
+            accountsModel: accountsLogic.accountsModel
+            onCancel: {
+                accountChooserLoader.sourceComponent = null
+                root.accountSelected(root.__lastAccountDataLocation, false)
+            }
+            onAccountSelected: {
+                accountChooserLoader.sourceComponent = null
+                accountsLogic.setupAccount(accountId)
+            }
+        }
+    }
+
+    ProviderModel {
+        id: providerModel
+        applicationId: root.applicationId
+    }
+
+    function __setupProviderData() {
+        for (var i = 0; i < providerModel.count; i++) {
+            if (providerModel.get(i, "providerId") === root.providerId) {
+                root.__providerName = providerModel.get(i, "displayName")
+                break
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        __setupProviderData()
+    }
+
+    function showErrorScreen(message) {
+        errorScreen.message = message
+        errorScreen.visible = true
+    }
+
+    function showSplashScreen() {
+        splashScreen.visible = true
+    }
+
+    function showAccountSwitcher() {
+        accountChooserLoader.sourceComponent = accountChooserComponent
+    }
+
+    function __emitAccountSelected(credentialsId, willMoveCookies) {
+        __lastAccountDataLocation = credentialsId > 0 ? ("/id-" + credentialsId) : ""
+        accountSelected(__lastAccountDataLocation, willMoveCookies)
+    }
+
+    function setupWebcontextForAccount(webcontext) {
+        accountsLogic.setupWebcontextForAccount(webcontext)
+    }
+}

=== added file 'webapp-googleplus/lib/webcontainer/AccountsSplashScreen.qml'
--- webapp-googleplus/lib/webcontainer/AccountsSplashScreen.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/AccountsSplashScreen.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2015 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.4
+import Ubuntu.Components 1.3
+
+SplashScreen {
+    id: root
+
+    property string providerName
+    property bool accountMandatory: true
+
+    signal chooseAccount()
+    signal skip()
+    signal quitRequested()
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        spacing: units.gu(2)
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            horizontalAlignment: Text.AlignHCenter
+            wrapMode: Text.WordWrap
+            // TRANSLATORS: %1 refers to the application name, %2 refers to the account provider
+            text: i18n.tr("<b>%1</b> needs to access your %2 online account.").arg(root.applicationName).arg(root.providerName)
+            visible: root.accountMandatory
+        }
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            horizontalAlignment: Text.AlignHCenter
+            wrapMode: Text.WordWrap
+            // TRANSLATORS: %1 refers to the application name, %2 refers to the account provider
+            text: i18n.tr("<b>%1</b> would like to access your %2 online account.").arg(root.applicationName).arg(root.providerName)
+            visible: !root.accountMandatory
+        }
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            horizontalAlignment: Text.AlignHCenter
+            wrapMode: Text.WordWrap
+            text: i18n.tr("Choose an account now, or skip this step and choose an online account later.")
+            visible: !root.accountMandatory
+        }
+
+        Item {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.margins: units.gu(1)
+            height: units.gu(6)
+
+            Button {
+                anchors.left: parent.left
+                width: parent.width / 2 - units.gu(1)
+                text: root.accountMandatory ? i18n.tr("Close the app") : i18n.tr("Skip")
+                onClicked: root.accountMandatory ? root.quitRequested() : root.skip()
+            }
+
+            Button {
+                anchors.right: parent.right
+                width: parent.width / 2 - units.gu(1)
+                text: i18n.tr("Choose account")
+                onClicked: root.chooseAccount()
+            }
+        }
+    }
+}

=== renamed file 'webapp-googleplus/lib/AuthenticationDialog.qml' => 'webapp-googleplus/lib/webcontainer/AuthenticationDialog.qml'
=== renamed file 'webapp-googleplus/lib/BrowserView.qml' => 'webapp-googleplus/lib/webcontainer/BrowserView.qml'
=== renamed file 'webapp-googleplus/lib/CertificateVerificationDialog.qml' => 'webapp-googleplus/lib/webcontainer/CertificateVerificationDialog.qml'
=== added file 'webapp-googleplus/lib/webcontainer/Chrome.qml'
--- webapp-googleplus/lib/webcontainer/Chrome.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/Chrome.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2013-2015 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.4
+import Ubuntu.Components 1.3
+import ".."
+
+ChromeBase {
+    id: chrome
+
+    property var webview: null
+    property bool navigationButtonsVisible: false
+    property bool accountSwitcher: false
+
+    loading: webview && webview.loading
+    loadProgress: loading ? webview.loadProgress : 0
+
+    function updateChromeElementsColor(color) {
+        chromeTextLabel.color = color
+
+        backButton.iconColor = color
+        forwardButton.iconColor = color
+
+        reloadButton.iconColor = color
+        accountsButton.iconColor = color
+    }
+
+    signal chooseAccount()
+
+    FocusScope {
+        anchors {
+            fill: parent
+            margins: units.gu(1)
+        }
+
+        focus: true
+
+        ChromeButton {
+            id: backButton
+            objectName: "backButton"
+
+            iconName: "previous"
+            iconSize: 0.6 * height
+
+            height: parent.height
+            visible: chrome.navigationButtonsVisible
+            width: visible ? height : 0
+
+            anchors {
+                left: parent.left
+                verticalCenter: parent.verticalCenter
+            }
+
+            enabled: chrome.webview ? chrome.webview.canGoBack : false
+            onTriggered: chrome.webview.goBack()
+        }
+
+        ChromeButton {
+            id: forwardButton
+            objectName: "forwardButton"
+
+            iconName: "next"
+            iconSize: 0.6 * height
+
+            height: parent.height
+            visible: chrome.navigationButtonsVisible && enabled
+            width: visible ? height : 0
+
+            anchors {
+                left: backButton.right
+                verticalCenter: parent.verticalCenter
+            }
+
+            enabled: chrome.webview ? chrome.webview.canGoForward : false
+            onTriggered: chrome.webview.goForward()
+        }
+
+        Item {
+            id: faviconContainer
+
+            height: parent.height
+            width: height
+            anchors.left: forwardButton.right
+
+            Favicon {
+                anchors.centerIn: parent
+                source: chrome.webview ? chrome.webview.icon : null
+            }
+        }
+
+        Label {
+            id: chromeTextLabel
+            objectName: "chromeTextLabel"
+
+            anchors {
+                left: faviconContainer.right
+                right: reloadButton.left
+                rightMargin: units.gu(1)
+                verticalCenter: parent.verticalCenter
+            }
+
+            text: chrome.webview.title ? chrome.webview.title : chrome.webview.url
+            elide: Text.ElideRight
+        }
+
+        ChromeButton {
+            id: reloadButton
+            objectName: "reloadButton"
+
+            iconName: "reload"
+            iconSize: 0.6 * height
+
+            height: parent.height
+            visible: chrome.navigationButtonsVisible
+            width: visible ? height : 0
+
+            anchors {
+                right: accountsButton.left
+                verticalCenter: parent.verticalCenter
+            }
+
+            enabled: chrome.webview.url && chrome.webview.url !== ""
+            onTriggered: chrome.webview.reload()
+        }
+
+        ChromeButton {
+            id: accountsButton
+            objectName: "accountsButton"
+
+            iconName: "contact"
+            iconSize: 0.6 * height
+
+            height: parent.height
+            width: visible ? height : 0
+
+            anchors {
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+
+            visible: accountSwitcher
+            onTriggered: chrome.chooseAccount()
+        }
+    }
+}

=== renamed file 'webapp-googleplus/lib/ChromeBase.qml' => 'webapp-googleplus/lib/webcontainer/ChromeBase.qml'
=== renamed file 'webapp-googleplus/lib/ChromeButton.qml' => 'webapp-googleplus/lib/webcontainer/ChromeButton.qml'
=== renamed file 'webapp-googleplus/lib/ChromeStateTracker.qml' => 'webapp-googleplus/lib/webcontainer/ChromeStateTracker.qml'
=== renamed file 'webapp-googleplus/lib/ContentDownloadDialog.qml' => 'webapp-googleplus/lib/webcontainer/ContentDownloadDialog.qml'
--- webapp-googleplus/lib/ContentDownloadDialog.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/webcontainer/ContentDownloadDialog.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,34 +16,52 @@
  * 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
-import Ubuntu.Content 0.1
-
-PopupBase {
-    id: downloadDialog
-    anchors.fill: parent
-    property var activeTransfer
-    property var downloadId
-    property alias contentType: peerPicker.contentType
-
-    Rectangle {
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Content 1.3
+import webbrowsercommon.private 0.1
+import ".."
+
+Component {
+    PopupBase {
+        id: downloadDialog
+        objectName: "downloadDialog"
         anchors.fill: parent
-        ContentPeerPicker {
-            id: peerPicker
+        property var activeTransfer
+        property var downloadId
+        property var singleDownload
+        property var mimeType
+        property var filename
+        property var icon: MimeDatabase.iconForMimetype(mimeType)
+        property alias contentType: peerPicker.contentType
+    
+        ContentPeerModel {
+            id: peerModel
             handler: ContentHandler.Destination
-            visible: parent.visible
-
-            onPeerSelected: {
-                activeTransfer = peer.request()
-                activeTransfer.downloadId = downloadDialog.downloadId
-                activeTransfer.state = ContentTransfer.Downloading
-                PopupUtils.close(downloadDialog)
-            }
-
-            onCancelPressed: {
-                PopupUtils.close(downloadDialog)
+            contentType: downloadDialog.contentType
+        }
+    
+        Rectangle {
+            id: pickerRect
+            anchors.fill: parent
+            visible: true
+            ContentPeerPicker {
+                id: peerPicker
+                handler: ContentHandler.Destination
+                objectName: "contentPeerPicker"
+                visible: parent.visible
+    
+                onPeerSelected: {
+                    activeTransfer = peer.request()
+                    activeTransfer.downloadId = downloadDialog.downloadId
+                    activeTransfer.state = ContentTransfer.Downloading
+                    PopupUtils.close(downloadDialog)
+                }
+    
+                onCancelPressed: {
+                    PopupUtils.close(downloadDialog)
+                }
             }
         }
     }

=== renamed file 'webapp-googleplus/lib/ContentPickerDialog.qml' => 'webapp-googleplus/lib/webcontainer/ContentPickerDialog.qml'
--- webapp-googleplus/lib/ContentPickerDialog.qml	2015-03-13 16:35:21 +0000
+++ webapp-googleplus/lib/webcontainer/ContentPickerDialog.qml	2016-12-02 07:06:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 1.0 as Popups
-import Ubuntu.Content 0.1
-import "MimeTypeMapper.js" as MimeTypeMapper
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3 as Popups
+import Ubuntu.Content 1.3
+import "../MimeTypeMapper.js" as MimeTypeMapper
+import ".."
 
 Component {
     Popups.PopupBase {
@@ -33,7 +34,6 @@
         parent: QuickUtils.rootItem(this)
 
         property var activeTransfer
-        property var selectedItems
 
         Rectangle {
             anchors.fill: parent
@@ -61,7 +61,6 @@
                 }
 
                 onCancelPressed: {
-                    webview.focus = true
                     model.reject()
                 }
             }
@@ -69,30 +68,13 @@
 
         Connections {
             id: stateChangeConnection
+            target: null
             onStateChanged: {
                 if (picker.activeTransfer.state === ContentTransfer.Charged) {
-                    selectedItems = []
+                    var 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)
                 }
             }

=== renamed file 'webapp-googleplus/lib/ContentShareDialog.qml' => 'webapp-googleplus/lib/webcontainer/ContentShareDialog.qml'
=== added file 'webapp-googleplus/lib/webcontainer/ContextMenuMobile.qml'
--- webapp-googleplus/lib/webcontainer/ContextMenuMobile.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/ContextMenuMobile.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2015-2016 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components.Popups 1.3 as Popups
+import com.canonical.Oxide 1.8 as Oxide
+
+Popups.Dialog {
+    property QtObject contextModel: model
+    property ActionList actions: null
+
+    objectName: "contextMenuMobile"
+
+    QtObject {
+        id: internal
+        readonly property bool isImage: (contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
+                                        (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)
+    }
+
+    Row {
+        id: header
+        spacing: units.gu(2)
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+        height: units.gu(2 * title.lineCount + 3)
+        visible: title.text
+
+        Icon {
+            width: units.gu(2)
+            height: units.gu(2)
+            anchors {
+                top: parent.top
+                topMargin: units.gu(2)
+            }
+            name: internal.isImage ? "stock_image" : ""
+            // work around the lack of a standard stock_link symbolic icon in the theme
+            Component.onCompleted: {
+                if (!name) {
+                    source = "assets/stock_link.svg"
+                }
+            }
+        }
+
+        Label {
+            id: title
+            objectName: "titleLabel"
+            text: contextModel.srcUrl.toString() ? contextModel.srcUrl : contextModel.linkUrl
+            width: parent.width - units.gu(4)
+            anchors {
+                top: parent.top
+                topMargin: units.gu(2)
+                bottom: parent.bottom
+            }
+            fontSize: "x-small"
+            maximumLineCount: 2
+            wrapMode: Text.Wrap
+            height: contentHeight
+        }
+    }
+
+    ListItems.ThinDivider {
+        anchors {
+            left: parent.left
+            leftMargin: units.gu(2)
+            right: parent.right
+            rightMargin: units.gu(2)
+        }
+        visible: header.visible
+    }
+
+    Repeater {
+        model: actions.children
+        delegate: ListItems.Empty {
+            action: modelData
+            objectName: action.objectName + "_item"
+            visible: action.enabled
+            showDivider: false
+
+            height: units.gu(5)
+
+            Label {
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                }
+                fontSize: "x-small"
+                text: action.text
+            }
+
+            ListItems.ThinDivider {
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                    bottom: parent.bottom
+                }
+            }
+
+            onTriggered: contextModel.close()
+        }
+    }
+
+    ListItems.Empty {
+        objectName: "cancelAction"
+        height: units.gu(5)
+        showDivider: false
+        Label {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+                verticalCenter: parent.verticalCenter
+            }
+            fontSize: "x-small"
+            text: i18n.tr("Cancel")
+        }
+        onTriggered: contextModel.close()
+    }
+
+    // adjust default dialog visuals to custom requirements for the context menu
+    Binding {
+        target: __foreground
+        property: "margins"
+        value: 0
+    }
+    Binding {
+        target: __foreground
+        property: "itemSpacing"
+        value: 0
+    }
+
+    // We can’t prevent the dialog from stealing the focus from
+    // the webview, but we can at least restore it when the
+    // dialog is closed (https://launchpad.net/bugs/1526884).
+    Component.onDestruction: Oxide.WebView.view.forceActiveFocus()
+}

=== added file 'webapp-googleplus/lib/webcontainer/ContextMenuWide.qml'
--- webapp-googleplus/lib/webcontainer/ContextMenuWide.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/ContextMenuWide.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2015-2016 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components.Popups 1.3 as Popups
+import com.canonical.Oxide 1.8 as Oxide
+
+Popups.Popover {
+    id: contextMenu
+
+    objectName: "contextMenuWide"
+
+    property QtObject contextModel: model
+    property ActionList actions: null
+    property var associatedWebview: null
+
+    QtObject {
+        id: internal
+
+        readonly property int lastEnabledActionIndex: {
+            var last = -1
+            for (var i in actions.children) {
+                if (actions.children[i].enabled) {
+                    last = i
+                }
+            }
+            return last
+        }
+
+        readonly property real locationBarOffset: contextMenu.associatedWebview.locationBarController.height
+                                                  + contextMenu.associatedWebview.locationBarController.offset
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "#ececec"
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+
+        Label {
+            id: titleLabel
+            objectName: "titleLabel"
+            text: contextModel.srcUrl.toString() ? contextModel.srcUrl : contextModel.linkUrl
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            height: units.gu(5)
+            visible: text
+            fontSize: "x-small"
+            color: "#888888"
+            elide: Text.ElideRight
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        ListItems.ThinDivider {
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+            }
+            visible: titleLabel.visible
+        }
+
+        Repeater {
+            model: actions.children
+            delegate: ListItems.Empty {
+                action: modelData
+                objectName: action.objectName + "_item"
+                visible: action.enabled
+                showDivider: false
+
+                height: units.gu(5)
+
+                Label {
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        right: parent.right
+                        rightMargin: units.gu(2)
+                        verticalCenter: parent.verticalCenter
+                    }
+                    fontSize: "small"
+                    text: action.text
+                }
+
+                ListItems.ThinDivider {
+                    visible: index < internal.lastEnabledActionIndex
+                    anchors {
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                        right: parent.right
+                        rightMargin: units.gu(2)
+                        bottom: parent.bottom
+                    }
+                }
+
+                onTriggered: contextMenu.hide()
+            }
+        }
+    }
+
+    Item {
+        id: positioner
+        visible: false
+        parent: contextMenu.associatedWebview
+        x: contextModel.position.x
+        y: contextModel.position.y + internal.locationBarOffset
+    }
+    caller: positioner
+
+    onVisibleChanged: {
+        if (!visible) {
+            contextModel.close()
+        }
+    }
+
+    // Override default implementation to prevent context menu from stealing
+    // active focus when shown (https://launchpad.net/bugs/1526884).
+    function show() {
+        visible = true
+        __foreground.show()
+    }
+
+    Binding {
+        // Ensure the context menu doesn’t steal focus from
+        // the webview when one of its actions is activated
+        // (https://launchpad.net/bugs/1526884).
+        target: __foreground
+        property: "activeFocusOnPress"
+        value: false
+    }
+}

=== renamed file 'webapp-googleplus/lib/ErrorSheet.qml' => 'webapp-googleplus/lib/webcontainer/ErrorSheet.qml'
=== renamed file 'webapp-googleplus/lib/Favicon.qml' => 'webapp-googleplus/lib/webcontainer/Favicon.qml'
=== renamed file 'webapp-googleplus/lib/FilePickerDialog.qml' => 'webapp-googleplus/lib/webcontainer/FilePickerDialog.qml'
=== renamed file 'webapp-googleplus/lib/GeolocationPermissionRequest.qml' => 'webapp-googleplus/lib/webcontainer/GeolocationPermissionRequest.qml'
=== renamed file 'webapp-googleplus/lib/InvalidCertificateErrorSheet.qml' => 'webapp-googleplus/lib/webcontainer/InvalidCertificateErrorSheet.qml'
=== renamed file 'webapp-googleplus/lib/KeyboardRectangle.qml' => 'webapp-googleplus/lib/webcontainer/KeyboardRectangle.qml'
=== added file 'webapp-googleplus/lib/webcontainer/OnlineAccountsController.qml'
--- webapp-googleplus/lib/webcontainer/OnlineAccountsController.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/OnlineAccountsController.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2015 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.4
+
+Loader {
+    id: root
+
+    property string providerId: ""
+    property string applicationId: ""
+    property bool accountSwitcher: false
+    property string webappName: ""
+    property url webappIcon
+
+    signal accountSelected(string accountDataLocation, bool willMoveCookies)
+    signal contextReady()
+    signal quitRequested()
+
+    function setupWebcontextForAccount(webcontext) {
+        if (item) {
+            item.setupWebcontextForAccount(webcontext)
+        } else {
+            root.contextReady()
+        }
+    }
+
+    function showAccountSwitcher() {
+        if (item) item.showAccountSwitcher()
+    }
+
+    Component.onCompleted: {
+        if (providerId.length === 0) {
+            accountSelected("", false)
+        } else {
+            setSource("AccountsPage.qml", {
+                "providerId": providerId,
+                "applicationId": applicationId,
+                "accountSwitcher": accountSwitcher,
+                "webappName": webappName,
+                "webappIcon": webappIcon,
+            })
+        }
+    }
+
+    Connections {
+        target: item
+        onAccountSelected: root.accountSelected(accountDataLocation, willMoveCookies)
+        onContextReady: root.contextReady()
+        onQuitRequested: root.quitRequested()
+    }
+}

=== renamed file 'webapp-googleplus/lib/PermissionRequest.qml' => 'webapp-googleplus/lib/webcontainer/PermissionRequest.qml'
=== added file 'webapp-googleplus/lib/webcontainer/PopupWindowController.qml'
--- webapp-googleplus/lib/webcontainer/PopupWindowController.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/PopupWindowController.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2014-2016 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.4
+import com.canonical.Oxide 1.0 as Oxide
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Qt.labs.settings 1.0
+
+Item {
+    id: controller
+
+    property var webappUrlPatterns
+    property var mainWebappView
+    property var views: []
+    property bool blockOpenExternalUrls: false
+    property var mediaAccessDialogComponent
+    property bool wide: false
+
+    // Used to access runtime behavior during tests
+    signal openExternalUrlTriggered(string url)
+    signal newViewCreated(string url)
+    signal windowOverlayOpenAnimationDone()
+
+    signal initializeOverlayViewsWithUrls(var urls)
+
+    readonly property int maxSimultaneousViews: 3
+
+    Settings {
+        id: webviewOverlayUrlsSettings
+        property string overlayUrls
+    }
+
+    QtObject {
+        id: internal
+        property var urlPerOverlayView
+    }
+
+    function updateOverlayUrlsSettings() {
+        var urls = []
+        webviewOverlayUrlsSettings.overlayUrls = "[]"
+        for (var i in internal.urlPerOverlayView) {
+            urls.push(internal.urlPerOverlayView[i].toString())
+        }
+        webviewOverlayUrlsSettings.overlayUrls = JSON.stringify(urls)
+    }
+    function onUrlUpdatedForOverlay(overlayView, url) {
+        if (!internal.urlPerOverlayView) {
+            internal.urlPerOverlayView = {}
+        }
+
+        internal.urlPerOverlayView[overlayView] = url
+
+        updateOverlayUrlsSettings()
+    }
+
+    Connections {
+        target: Qt.application
+        onAboutToQuit: {
+            webviewOverlayUrlsSettings.overlayUrls = "[]"
+        }
+    }
+
+    Component.onCompleted: {
+        if (webviewOverlayUrlsSettings.overlayUrls
+                && webviewOverlayUrlsSettings.overlayUrls.length > 0) {
+            try {
+                var urls = JSON.parse(webviewOverlayUrlsSettings.overlayUrls)
+                if (typeof(urls) === 'object'
+                        && urls.length != undefined
+                        && urls.length > 0) {
+                    initializeOverlayViewsWithUrls(urls)
+                }
+            } catch (e) {}
+        }
+    }
+
+    function openUrlExternally(url) {
+        if (!blockOpenExternalUrls) {
+            Qt.openUrlExternally(url)
+        }
+        openExternalUrlTriggered(url)
+    }
+
+    function onOverlayMoved(popup, diffY) {
+        if ((popup.y + diffY) > 0) {
+            popup.y += diffY
+        }
+    }
+    function handleNewViewAdded(view) {
+        if (views.length !== 0) {
+            var topView = views[views.length-1]
+        }
+        views.push(view)
+
+        view.webviewUrlChanged.connect(function(webviewUrl) {
+            onUrlUpdatedForOverlay(view, webviewUrl)
+        })
+    }
+    function handleOpenInUrlBrowserForView(url, view) {
+        handleViewRemoved(view)
+        openExternalUrlTriggered(url)
+        openUrlExternally(url)
+    }
+    function createViewSlidingHandlerFor(newView, viewBelow) {
+        var parentHeight = viewBelow.parent.height
+        return function() {
+            if (viewBelow && newView) {
+                viewBelow.opacity =
+                    newView.y / parentHeight
+            }
+        }
+    }
+    function topViewOnStack() {
+        if (views.length !== 0) {
+            return views[views.length-1]
+        }
+        return mainWebappView
+    }
+    function handleViewRemoved(view) {
+        if (views.length === 0) {
+            return
+        }
+
+        var topMostView = views[views.length-1]
+        if (topMostView !== view) {
+            return
+        }
+        views.pop()
+        if (internal.urlPerOverlayView) {
+            delete internal.urlPerOverlayView[topMostView]
+            updateOverlayUrlsSettings()
+        }
+
+        var parentHeight = topMostView.parent.height
+        var nextView = topViewOnStack()
+        nextView.visible = true
+
+        function onViewSlidingOut() {
+            if (topMostView.y >= (topMostView.parent.height - 10)) {
+                topMostView.yChanged.disconnect(onViewSlidingOut)
+                topMostView.destroy()
+
+                updateViewVisibility(nextView, true)
+            }
+        }
+        topMostView.yChanged.connect(onViewSlidingOut)
+        topMostView.y = topMostView.parent.height
+    }
+    function updateViewVisibility(view, visible) {
+        if (view) {
+            view.opacity = visible ? 1.0 : 0.0
+        }
+    }
+    function createPopupView(parentView, params, isRequestFromMainWebappWebview, context) {
+        var view = popupWebOverlayFactory.createObject(
+            parentView,
+            params);
+
+        var topMostView = topViewOnStack()
+
+        // handle opacity updates of the view below this one
+        // when the view is sliding
+        view.yChanged.connect(
+            createViewSlidingHandlerFor(view, topMostView))
+
+        function onViewSlidingIn() {
+            var parentHeight = view.parent.height
+
+            if (view.y <= 10) {
+                view.yChanged.disconnect(onViewSlidingIn)
+
+                updateViewVisibility(topMostView, false)
+            }
+        }
+        view.yChanged.connect(onViewSlidingIn)
+
+        view.y = 0
+        handleNewViewAdded(view)
+        newViewCreated(view.url)
+    }
+    function createPopupViewForRequest(parentView, request, isRequestFromMainWebappWebview, context) {
+        createPopupView(parentView,
+                        { request: request,
+                          webContext: context,
+                          popupWindowController: controller,
+                          mediaAccessDialogComponent: mediaAccessDialogComponent
+                        },
+                        isRequestFromMainWebappWebview,
+                        context)
+    }
+    function createPopupViewForUrl(parentView,
+                                   overlayUrl,
+                                   isRequestFromMainWebappWebview,
+                                   context) {
+        createPopupView(parentView,
+                        { url: overlayUrl,
+                          webContext: context,
+                          popupWindowController: controller,
+                          mediaAccessDialogComponent: mediaAccessDialogComponent
+                        },
+                        isRequestFromMainWebappWebview,
+                        context)
+    }
+
+    Component {
+        id: popupWebOverlayFactory
+        PopupWindowOverlay {
+            id: overlay
+
+            height: parent.height
+            width: parent.width
+
+            wide: controller.wide
+
+            y: overlay.parent.height
+
+            // Poor mans heuristic to know when an overlay has been
+            // loaded and is in full view. We cannot rely on the
+            // NumberAnimation running/started since they dont
+            // work properly when inside a Behavior
+            onYChanged: {
+                if (y === 0) {
+                    windowOverlayOpenAnimationDone()
+                }
+            }
+	    
+            Behavior on y {
+                NumberAnimation {
+                    duration: 500
+                    easing.type: Easing.InOutQuad
+                }
+            }
+        }
+    }
+
+    function handleNewForegroundNavigationRequest(
+            url, request, isRequestFromMainWebappWebview) {
+
+        if (views.length >= maxSimultaneousViews) {
+            request.action = Oxide.NavigationRequest.ActionReject
+            // Default to open externally, maybe should present a dialog
+            openUrlExternally(url.toString())
+            console.log("Maximum number of popup overlay opened, opening: "
+                        + url
+                        + " in the browser")
+            return false
+        }
+        return true
+    }
+}

=== added file 'webapp-googleplus/lib/webcontainer/PopupWindowOverlay.qml'
--- webapp-googleplus/lib/webcontainer/PopupWindowOverlay.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/PopupWindowOverlay.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2014-2016 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.4
+import QtQuick.Window 2.2
+import com.canonical.Oxide 1.4 as Oxide
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import ".."
+
+FocusScope {
+    id: popup
+
+    property var popupWindowController
+    property var webContext
+    property alias currentWebview: popupWebview
+    property alias request: popupWebview.request
+    property alias url: popupWebview.url
+    property var mediaAccessDialogComponent
+    property alias wide: popupWebview.wide
+
+    signal webviewUrlChanged(url webviewUrl)
+
+    focus: true
+
+    Rectangle {
+        color: "#F2F1F0"
+        anchors.fill: parent
+    }
+
+    Item {
+        id: menubar
+
+        height: units.gu(6)
+        width: parent.width
+
+        anchors {
+            top: parent.top
+            horizontalCenter: parent.horizontalCenter
+        }
+
+        ChromeButton {
+            id: closeButton
+            objectName: "overlayCloseButton"
+            anchors {
+                left: parent.left
+                verticalCenter: parent.verticalCenter
+            }
+
+            height: parent.height
+            width: height
+
+            iconName: "dropdown-menu"
+            iconSize: 0.6 * height
+
+            enabled: true
+            visible: true
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (popupWindowController) {
+                        popupWindowController.handleViewRemoved(popup)
+                    }
+                }
+            }
+        }
+
+        Item {
+            anchors  {
+                top: parent.top
+                bottom: parent.bottom
+                left: closeButton.right
+                right: buttonOpenInBrowser.left
+            }
+
+            Label {
+                anchors {
+                    rightMargin: units.gu(2)
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    right: parent.right
+                }
+
+                text: popupWebview.title ? popupWebview.title : popupWebview.url
+                elide: Text.ElideRight
+            }
+
+            MouseArea {
+                anchors.fill: parent
+
+                property int initMouseY: 0
+                property int prevMouseY: 0
+
+                onPressed: {
+                    initMouseY = mouse.y
+                    prevMouseY = initMouseY
+                }
+                onReleased: {
+                    if ((prevMouseY - initMouseY) > (popup.height / 8) ||
+                            popup.y > popup.height/2) {
+                        if (popupWindowController) {
+                            popupWindowController.handleViewRemoved(popup)
+                            return
+                        }
+                    }
+                    popup.y = 0
+                }
+                onMouseYChanged: {
+                    if (popupWindowController) {
+                        var diff = mouseY - initMouseY
+                        prevMouseY = mouseY
+                        popupWindowController.onOverlayMoved(popup, diff)
+                    }
+                }
+            }
+        }
+
+        ChromeButton {
+            id: buttonOpenInBrowser
+            objectName: "overlayButtonOpenInBrowser"
+            anchors {
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+                rightMargin: units.gu(1)
+            }
+
+            height: parent.height
+            width: height
+
+            iconName: "external-link"
+            iconSize: 0.6 * height
+
+            enabled: true
+            visible: true
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (popupWindowController) {
+                        popupWindowController.handleOpenInUrlBrowserForView(
+                                    popupWebview.url, popup)
+                    }
+                }
+            }
+        }
+    }
+
+    WebappWebview {
+        id: popupWebview
+
+        objectName: "overlayWebview"
+
+        context: webContext
+
+        onUrlChanged: webviewUrlChanged(popupWebview.url)
+
+        focus: true
+
+        Connections {
+            target: popupWebview.visible ? popupWebview : null
+
+            /**
+             * We are only connecting to the mediaAccessPermission signal if we are the currently
+             * visible overlay. If other overlays slide over this one, oxide will deny (by default)
+             * all media access requests for this overlay.
+             *
+             * See the browser's webbrowser/Browser.qml source for additional comments.
+             */
+            onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
+        }
+
+        onOpenUrlExternallyRequested: {
+            if (popupWindowController) {
+               popupWindowController.openUrlExternally(url)
+            }
+        }
+
+        anchors {
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+            top: menubar.bottom
+        }
+
+        onNewViewRequested: {
+            if (popupWindowController) {
+                popupWindowController.createPopupViewForRequest(
+                            popup.parent, request, false, context)
+            }
+        }
+
+        function isNewForegroundWebViewDisposition(disposition) {
+            return disposition === Oxide.NavigationRequest.DispositionNewPopup ||
+                    disposition === Oxide.NavigationRequest.DispositionNewForegroundTab;
+        }
+
+        onNavigationRequested: {
+            var url = request.url.toString()
+            request.action = Oxide.NavigationRequest.ActionAccept
+            if (isNewForegroundWebViewDisposition(request.disposition)) {
+                var shouldAcceptRequest =
+                        popupWindowController.handleNewForegroundNavigationRequest(
+                              url, request, false);
+                if (!shouldAcceptRequest) {
+                    request.action = Oxide.NavigationRequest.ActionReject
+                }
+            }
+        }
+
+        onCloseRequested: {
+            if (popupWindowController) {
+                popupWindowController.handleViewRemoved(popup)
+            }
+        }
+
+        Loader {
+            anchors {
+                fill: popupWebview
+            }
+            active: webProcessMonitor.crashed || (webProcessMonitor.killed && !popupWebview.currentWebview.loading)
+            sourceComponent: SadPage {
+                webview: popupWebview
+                objectName: "overlaySadPage"
+            }
+            WebProcessMonitor {
+                id: webProcessMonitor
+                webview: popupWebview
+            }
+            asynchronous: true
+        }
+    }
+}

=== renamed file 'webapp-googleplus/lib/ProxyAuthenticationDialog.qml' => 'webapp-googleplus/lib/webcontainer/ProxyAuthenticationDialog.qml'
=== added file 'webapp-googleplus/lib/webcontainer/SadPage.qml'
--- webapp-googleplus/lib/webcontainer/SadPage.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/SadPage.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015-2016 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.4
+import Ubuntu.Components 1.3
+
+Rectangle {
+    property var webview
+
+    Column {
+        anchors {
+            fill: parent
+            margins: units.gu(4)
+        }
+        spacing: units.gu(4)
+
+        Image {
+            anchors.horizontalCenter: parent.horizontalCenter
+            source: "assets/tab-error.png"
+        }
+
+        Label {
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            wrapMode: Text.Wrap
+            horizontalAlignment: Text.AlignHCenter
+            text: webview ? i18n.tr("Oops, something went wrong.") : ""
+        }
+
+        Button {
+            anchors.horizontalCenter: parent.horizontalCenter
+            objectName: "reloadButton"
+            text: i18n.tr("Reload")
+            color: theme.palette.normal.positive
+            onClicked: webview.reload()
+        }
+    }
+}

=== renamed file 'webapp-googleplus/lib/ScrollTracker.qml' => 'webapp-googleplus/lib/webcontainer/ScrollTracker.qml'
=== renamed file 'webapp-googleplus/lib/Share.qml' => 'webapp-googleplus/lib/webcontainer/Share.qml'
=== added file 'webapp-googleplus/lib/webcontainer/SplashScreen.qml'
--- webapp-googleplus/lib/webcontainer/SplashScreen.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/SplashScreen.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2015 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.OnlineAccounts 0.1
+
+Rectangle {
+    id: root
+
+    property string applicationName
+    property alias iconSource: icon.source
+    default property alias contents: contentsHolder.data
+
+    anchors.fill: parent
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: Math.max(contentItem.childrenRect.height, height)
+
+        Column {
+            anchors {
+                left: parent.left
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            spacing: units.gu(2)
+
+            Icon {
+                id: icon
+                anchors.horizontalCenter: parent.horizontalCenter
+                width: units.gu(10)
+                height: width
+            }
+
+            Label {
+                anchors.horizontalCenter: parent.horizontalCenter
+                fontSize: "x-large"
+                text: root.applicationName
+            }
+
+            Item {
+                id: contentsHolder
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: childrenRect.height
+            }
+        }
+    }
+}

=== renamed file 'webapp-googleplus/lib/ThinProgressBar.qml' => 'webapp-googleplus/lib/webcontainer/ThinProgressBar.qml'
=== added file 'webapp-googleplus/lib/webcontainer/WebApp.qml'
--- webapp-googleplus/lib/webcontainer/WebApp.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/WebApp.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,323 @@
+/*
+ * Copyright 2013-2016 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.4
+import webbrowsercommon.private 0.1
+import com.canonical.Oxide 1.5 as Oxide
+import Ubuntu.Components 1.3
+import Ubuntu.Unity.Action 1.1 as UnityActions
+import Ubuntu.UnityWebApps 0.1 as UnityWebApps
+import Qt.labs.settings 1.0
+import "../actions" as Actions
+import ".."
+import "ColorUtils.js" as ColorUtils
+
+BrowserView {
+    id: webapp
+    objectName: "webappBrowserView"
+
+    currentWebview: containerWebView.currentWebview
+
+    property alias window: containerWebView.window
+
+    property alias url: containerWebView.url
+
+    property bool accountSwitcher
+
+    property string webappModelSearchPath: ""
+
+    property var webappUrlPatterns
+    property alias popupRedirectionUrlPrefixPattern: containerWebView.popupRedirectionUrlPrefixPattern
+    property alias webviewOverrideFile: containerWebView.webviewOverrideFile
+    property alias blockOpenExternalUrls: containerWebView.blockOpenExternalUrls
+    property alias localUserAgentOverride: containerWebView.localUserAgentOverride
+    property alias dataPath: containerWebView.dataPath
+    property alias runningLocalApplication: containerWebView.runningLocalApplication
+    property alias openExternalUrlInOverlay: containerWebView.openExternalUrlInOverlay
+    property alias popupBlockerEnabled: containerWebView.popupBlockerEnabled
+
+    property string webappName: ""
+
+    property bool backForwardButtonsVisible: false
+    property bool chromeVisible: false
+    readonly property bool chromeless: !chromeVisible && !backForwardButtonsVisible && !accountSwitcher
+    readonly property real themeColorTextContrastFactor: 3.0
+
+    signal chooseAccount()
+
+    // Used for testing. There is a bug that currently prevents non visual Qt objects
+    // to be introspectable from AP which makes directly accessing the settings object
+    // not possible https://bugs.launchpad.net/autopilot-qt/+bug/1273956
+    property alias generatedUrlPatterns: urlPatternSettings.generatedUrlPatterns
+
+    currentWebcontext: currentWebview ? currentWebview.context : null
+
+    actions: [
+        Actions.Back {
+            enabled: webapp.backForwardButtonsVisible && containerWebView.currentWebview && containerWebView.currentWebview.canGoBack
+            onTriggered: containerWebView.currentWebview.goBack()
+        },
+        Actions.Forward {
+            enabled: webapp.backForwardButtonsVisible && containerWebView.currentWebview && containerWebView.currentWebview.canGoForward
+            onTriggered: containerWebView.currentWebview.goForward()
+        },
+        Actions.Reload {
+            onTriggered: containerWebView.currentWebview.reload()
+        }
+    ]
+
+    focus: true
+
+    Settings {
+        id: urlPatternSettings
+        property string generatedUrlPatterns
+    }
+
+    function addGeneratedUrlPattern(urlPattern) {
+        if (urlPattern.trim().length === 0) {
+            return;
+        }
+
+        var patterns = []
+        if (urlPatternSettings.generatedUrlPatterns
+                && urlPatternSettings.generatedUrlPatterns.trim().length !== 0) {
+            try {
+                patterns = JSON.parse(urlPatternSettings.generatedUrlPatterns)
+            } catch(e) {
+                console.error("Invalid JSON content found in url patterns file")
+            }
+            if (! (patterns instanceof Array)) {
+                console.error("Invalid JSON content type found in url patterns file (not an array)")
+                patterns = []
+            }
+        }
+        if (patterns.indexOf(urlPattern) < 0) {
+            patterns.push(urlPattern)
+
+            urlPatternSettings.generatedUrlPatterns = JSON.stringify(patterns)
+        }
+    }
+
+    function mergeUrlPatternSets(p1, p2) {
+        if ( ! (p1 instanceof Array)) {
+            return (p2 instanceof Array) ? p2 : []
+        }
+        if ( ! (p2 instanceof Array)) {
+            return (p1 instanceof Array) ? p1 : []
+        }
+        var p1hash = {}
+        var result = []
+        for (var i1 in p1) {
+            p1hash[p1[i1]] = 1
+            result.push(p1[i1])
+        }
+        for (var i2 in p2) {
+            if (! (p2[i2] in p1hash)) {
+                result.push(p2[i2])
+            }
+        }
+        return result
+    }
+
+    Item {
+        id: webviewContainer
+        anchors.fill: parent
+
+        WebappContainerWebview {
+            id: containerWebView
+            objectName: "webview"
+
+            wide: webapp.wide
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: parent.top
+            }
+            height: parent.height - osk.height
+            developerExtrasEnabled: webapp.developerExtrasEnabled
+
+            focus: true
+
+            onThemeColorMetaInformationDetected: {
+                var color = webappContainerHelper.rgbColorFromCSSColor(theme_color)
+                if (!webapp.chromeless && chromeLoader.item && color.length) {
+                    chromeLoader.item.backgroundColor = theme_color
+                    chromeLoader.item.updateChromeElementsColor(
+                            ColorUtils.getMostConstrastedColor(
+                                color,
+                                Qt.darker(theme_color, themeColorTextContrastFactor),
+                                Qt.lighter(theme_color, themeColorTextContrastFactor))
+                            )
+                }
+            }
+            onSamlRequestUrlPatternReceived: {
+                addGeneratedUrlPattern(urlPattern)
+            }
+            webappUrlPatterns: mergeUrlPatternSets(urlPatternSettings.generatedUrlPatterns,
+                                   webapp.webappUrlPatterns)
+
+            /**
+             * Use the --webapp parameter value w/ precedence, but also take into account
+             * the fact that a webapp 'name' can come from a webapp-properties.json file w/o
+             * being explictly defined here.
+             */
+            webappName: webapp.webappName === "" ? unityWebapps.name : webapp.webappName
+
+            Loader {
+                anchors {
+                    fill: containerWebView
+                    topMargin: (!webapp.chromeless && chromeLoader.item.state == "shown")
+                               ? chromeLoader.item.height
+                               : 0
+                }
+                active: containerWebView.currentWebview &&
+                        (webProcessMonitor.crashed || (webProcessMonitor.killed && !containerWebView.currentWebview.loading))
+                sourceComponent: SadPage {
+                    webview: containerWebView.currentWebview
+                    objectName: "mainWebviewSadPage"
+                }
+                WebProcessMonitor {
+                    id: webProcessMonitor
+                    webview: containerWebView.currentWebview
+                }
+                asynchronous: true
+            }
+        }
+
+        Loader {
+            anchors {
+                fill: containerWebView
+                topMargin: (!webapp.chromeless && chromeLoader.item.state == "shown") ? chromeLoader.item.height : 0
+            }
+            sourceComponent: ErrorSheet {
+                visible: containerWebView.currentWebview && containerWebView.currentWebview.lastLoadFailed
+                url: containerWebView.currentWebview ? containerWebView.currentWebview.url : ""
+                onRefreshClicked: {
+                    if (containerWebView.currentWebview)
+                        containerWebView.currentWebview.reload()
+                }
+            }
+            asynchronous: true
+        }
+
+        Loader {
+            id: chromeLoader
+
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+            }
+
+            sourceComponent: webapp.chromeless ? progressbarComponent : chromeComponent
+
+            Component {
+                id: chromeComponent
+
+                Chrome {
+                    webview: webapp.currentWebview
+                    navigationButtonsVisible: webapp.backForwardButtonsVisible
+                    accountSwitcher: webapp.accountSwitcher
+
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    height: units.gu(6)
+                    y: webapp.currentWebview ? containerWebView.currentWebview.locationBarController.offset : 0
+
+                    onChooseAccount: webapp.chooseAccount()
+                }
+            }
+
+            Component {
+                id: progressbarComponent
+
+                ThinProgressBar {
+                    visible: webapp.currentWebview && webapp.currentWebview.loading
+                    value: visible ? webapp.currentWebview.loadProgress : 0
+
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        top: parent.top
+                    }
+                }
+            }
+        }
+
+        Binding {
+            when: webapp.currentWebview && !webapp.chromeless
+            target: webapp.currentWebview ? webapp.currentWebview.locationBarController : null
+            property: 'height'
+            value: webapp.currentWebview.visible ? chromeLoader.item.height : 0
+        }
+
+        ChromeController {
+            webview: webapp.currentWebview
+            forceHide: webapp.chromeless
+            defaultMode: webapp.hasTouchScreen
+                             ? Oxide.LocationBarController.ModeAuto
+                             : Oxide.LocationBarController.ModeShown
+        }
+    }
+
+    UnityWebApps.UnityWebApps {
+        id: unityWebapps
+        name: webappName
+        bindee: containerWebView.currentWebview
+        actionsContext: actionManager.globalContext
+        model: UnityWebApps.UnityWebappsAppModel { searchPath: webappModelSearchPath }
+        injectExtraUbuntuApis: runningLocalApplication
+        injectExtraContentShareCapabilities: !runningLocalApplication
+
+        Component.onCompleted: {
+            // Delay bind the property to add a bit of backward compatibility with
+            // other unity-webapps-qml modules
+            if (unityWebapps.embeddedUiComponentParent !== undefined) {
+                unityWebapps.embeddedUiComponentParent = webapp
+            }
+        }
+    }
+
+    // F5 or Ctrl+R: Reload current Tab
+    Shortcut {
+        sequence: "Ctrl+r"
+        enabled: currentWebview && currentWebview.visible
+        onActivated: currentWebview.reload()
+    }
+    Shortcut {
+        sequence: "F5"
+        enabled: currentWebview && currentWebview.visible
+        onActivated: currentWebview.reload()
+    }
+
+    // Alt+← or Backspace: Goes to the previous page
+    Shortcut {
+        sequence: StandardKey.Back
+        enabled: currentWebview && currentWebview.canGoBack
+        onActivated: currentWebview.goBack()
+    }
+
+    // Alt+→ or Shift+Backspace: Goes to the next page
+    Shortcut {
+        sequence: StandardKey.Forward
+        enabled: currentWebview && currentWebview.canGoForward
+        onActivated: currentWebview.goForward()
+    }
+}

=== added file 'webapp-googleplus/lib/webcontainer/WebViewImplOxide.qml'
--- webapp-googleplus/lib/webcontainer/WebViewImplOxide.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/WebViewImplOxide.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,297 @@
+/*
+ * Copyright 2014-2016 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.4
+import QtQuick.Window 2.2
+import com.canonical.Oxide 1.8 as Oxide
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.UnityWebApps 0.1 as UnityWebApps
+import Ubuntu.Web 0.2
+import ".."
+
+WebappWebview {
+    id: webview
+
+    // XXX: Ideally, we would use the Window.window
+    // attached property, but it is new in Qt 5.7.
+    property Window window
+
+    property bool developerExtrasEnabled: false
+    property string webappName: ""
+    property string localUserAgentOverride: ""
+    property var webappUrlPatterns: null
+    property string popupRedirectionUrlPrefixPattern: ""
+    property url dataPath
+    property var popupController
+    property var overlayViewsParent: webview.parent
+    property var mediaAccessDialogComponent
+    property bool openExternalUrlInOverlay: false
+    property bool popupBlockerEnabled: true
+
+    // Mostly used for testing & avoid external urls to
+    //  "leak" in the default browser. External URLs corresponds
+    //  to URLs that are not included in the set defined by the url patterns
+    //  (if any) or navigations resulting in new windows being created.
+    property bool blockOpenExternalUrls: false
+
+    signal samlRequestUrlPatternReceived(string urlPattern)
+    signal themeColorMetaInformationDetected(string theme_color)
+
+    // Those signals are used for testing purposes to externally
+    //  track down the various internal logic & steps of a popup lifecycle.
+    signal openExternalUrlTriggered(string url)
+    signal gotRedirectionUrl(string url)
+    property bool runningLocalApplication: false
+
+    onLoadEvent: {
+        var url = event.url.toString()
+        if (event.type === Oxide.LoadEvent.TypeRedirected
+                && url.indexOf("SAMLRequest") > 0) {
+            handleSamlRequestNavigation(url)
+        }
+    }
+
+    function openOverlayForUrl(overlayUrl) {
+        if (popupController) {
+            popupController.createPopupViewForUrl(
+                        overlayViewsParent,
+                        overlayUrl,
+                        true,
+                        context)
+        }
+    }
+
+    focus: true
+
+    currentWebview: webview
+
+    context: WebContext {
+        dataPath: webview.dataPath
+        userAgent: localUserAgentOverride ? localUserAgentOverride : defaultUserAgent
+
+        popupBlockerEnabled: webview.popupBlockerEnabled
+
+        userScripts: [
+            Oxide.UserScript {
+                context: "oxide://webapp-specific-page-metadata-collector/"
+                url: Qt.resolvedUrl("webapp-specific-page-metadata-collector.js")
+                incognitoEnabled: false
+                matchAllFrames: false
+            }
+        ]
+    }
+
+    Component.onCompleted: webappSpecificMessageHandler.createObject(
+                               webview,
+                               {
+                                   msgId: "webapp-specific-page-metadata-detected",
+                                   contexts: ["oxide://webapp-specific-page-metadata-collector/"],
+                                   callback: function(msg, frame) {
+                                       handlePageMetadata(msg.args)
+                                   }
+                               });
+
+    Component {
+        id: webappSpecificMessageHandler
+        Oxide.ScriptMessageHandler { }
+    }
+
+    onOpenUrlExternallyRequested: openUrlExternally(url, false)
+
+    preferences.allowFileAccessFromFileUrls: runningLocalApplication
+    preferences.allowUniversalAccessFromFileUrls: runningLocalApplication
+    preferences.localStorageEnabled: true
+    preferences.appCacheEnabled: true
+
+    onNewViewRequested: popupController.createPopupViewForRequest(overlayViewsParent, request, true, context)
+
+    Connections {
+        target: webview.visible ? webview : null
+
+        /**
+         * We are only connecting to the mediaAccessPermission signal if we are
+         * the only webview currently visible (no overlay present). In the case of an overlay
+         * and the absence of a signal handler in this main view, oxide's default behavior
+         * is triggered and the request is denied.
+         *
+         * See the browser's webbrowser/Browser.qml source for additional comments.
+         */
+        onMediaAccessPermissionRequested: PopupUtils.open(mediaAccessDialogComponent, null, { request: request })
+    }
+
+    StateSaver.properties: "url"
+    StateSaver.enabled: !runningLocalApplication
+
+    function handleSAMLRequestPattern(urlPattern) {
+        webappUrlPatterns.push(urlPattern)
+
+        samlRequestUrlPatternReceived(urlPattern)
+    }
+
+    function isRunningAsANamedWebapp() {
+        return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
+    }
+
+    function haveValidUrlPatterns() {
+        return webappUrlPatterns && webappUrlPatterns.length !== 0
+    }
+
+    function isNewForegroundWebViewDisposition(disposition) {
+        return disposition === Oxide.NavigationRequest.DispositionNewPopup ||
+               disposition === Oxide.NavigationRequest.DispositionNewForegroundTab;
+    }
+
+    function openUrlExternally(url, isTriggeredByUserNavigation) {
+        if (openExternalUrlInOverlay && isTriggeredByUserNavigation) {
+            popupController.createPopupViewForUrl(overlayViewsParent, url, true, context)
+            return
+        } else {
+            webview.openExternalUrlTriggered(url)
+            if (! webview.blockOpenExternalUrls) {
+                Qt.openUrlExternally(url)
+            }
+        }
+    }
+
+    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 (haveValidUrlPatterns()) {
+            for (var i = 0; i < webappUrlPatterns.length; ++i) {
+                var pattern = webappUrlPatterns[i]
+                if (url.match(pattern)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    function handleSamlRequestNavigation(url) {
+        var urlRegExp = new RegExp("https?://([^?/]+)")
+        var match = urlRegExp.exec(url)
+        var host = match[1]
+        var escapeDotsRegExp = new RegExp("\\.", "g")
+        var hostPattern = "https?://" + host.replace(escapeDotsRegExp, "\\.") + "/*"
+
+        console.log("SAML request detected. Adding host pattern: " + hostPattern)
+
+        handleSAMLRequestPattern(hostPattern)
+    }
+
+    function navigateToUrl(targetUrl) {
+        webview.forceActiveFocus()
+        webview.url = targetUrl
+    }
+
+    function navigationRequestedDelegate(request) {
+        var url = request.url.toString()
+        if (runningLocalApplication && url.indexOf("file://") !== 0) {
+            request.action = Oxide.NavigationRequest.ActionReject
+            openUrlExternally(url, true)
+            return
+        }
+
+        request.action = Oxide.NavigationRequest.ActionReject
+        if (isNewForegroundWebViewDisposition(request.disposition)) {
+            var shouldAcceptRequest =
+                    popupController.handleNewForegroundNavigationRequest(
+                          url, request, true);
+            if (shouldAcceptRequest) {
+                request.action = Oxide.NavigationRequest.ActionAccept
+            }
+            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 ( ! webview.haveValidUrlPatterns() && ! webview.isRunningAsANamedWebapp()) {
+            request.action = Oxide.NavigationRequest.ActionAccept
+            return
+        }
+
+        if (webview.shouldAllowNavigationTo(url))
+            request.action = Oxide.NavigationRequest.ActionAccept
+
+        // SAML requests are used for instance by Google Apps for your domain;
+        // they are implemented as a HTTP redirect to a URL containing the
+        // query parameter called "SAMLRequest".
+        // Besides letting the request through, we must also add the SAML
+        // domain to the list of the allowed hosts.
+        if (request.disposition === Oxide.NavigationRequest.DispositionCurrentTab
+                && url.indexOf("SAMLRequest") > 0) {
+            handleSamlRequestNavigation(url)
+            request.action = Oxide.NavigationRequest.ActionAccept
+        }
+
+        if (request.action === Oxide.NavigationRequest.ActionReject) {
+            console.debug('Opening: ' + url + ' in the browser window.')
+            openUrlExternally(url, true)
+        }
+    }
+
+    // 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 () {
+                window.raise();
+            }
+        };
+        return UnityWebAppsUtils.makeProxiesForWebViewBindee(webview, eventHandlers)
+    }
+
+    function handlePageMetadata(metadata) {
+        if (metadata.type === 'manifest') {
+            var request = new XMLHttpRequest();
+            request.onreadystatechange = function() {
+                if (request.readyState === XMLHttpRequest.DONE) {
+                    try {
+                        var manifest = JSON.parse(request.responseText);
+                        if (manifest['theme_color']
+                                && manifest['theme_color'].length !== 0) {
+                            themeColorMetaInformationDetected(manifest['theme_color'])
+                        }
+                    } catch(e) {}
+                }
+            }
+            request.open("GET", metadata.manifest);
+            request.send();
+        } else if (metadata.type === 'theme-color') {
+            if (metadata['theme_color']
+                    && metadata['theme_color'].length !== 0) {
+                themeColorMetaInformationDetected(metadata['theme_color'])
+            }
+        }
+    }
+}

=== added file 'webapp-googleplus/lib/webcontainer/WebappContainerWebview.qml'
--- webapp-googleplus/lib/webcontainer/WebappContainerWebview.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/WebappContainerWebview.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2014-2016 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.4
+import QtQuick.Window 2.2
+import Ubuntu.Components 1.3
+import Ubuntu.Unity.Action 1.1 as UnityActions
+import Ubuntu.UnityWebApps 0.1 as UnityWebApps
+import "../actions" as Actions
+import ".."
+
+FocusScope {
+    id: containerWebview
+
+    property Window window
+
+    property string url: ""
+    property bool developerExtrasEnabled: false
+    property string webappName: ""
+    property url dataPath
+    property var currentWebview: webappContainerWebViewLoader.item ?
+                                     webappContainerWebViewLoader.item.currentWebview
+                                   : null
+    property var webappUrlPatterns
+    property string localUserAgentOverride: ""
+    property string popupRedirectionUrlPrefixPattern: ""
+    property url webviewOverrideFile: ""
+    property bool blockOpenExternalUrls: false
+    property bool runningLocalApplication: false
+    property bool wide: false
+    property bool openExternalUrlInOverlay: false
+    property bool popupBlockerEnabled: true
+
+    signal samlRequestUrlPatternReceived(string urlPattern)
+    signal themeColorMetaInformationDetected(string theme_color)
+
+    onWideChanged: {
+        if (webappContainerWebViewLoader.item
+                && webappContainerWebViewLoader.item.wide !== undefined) {
+            webappContainerWebViewLoader.item.wide = wide
+        }
+    }
+
+    Component {
+        id: mediaAccessDialogComponent
+        MediaAccessDialog {
+            objectName: "mediaAccessDialog"
+        }
+    }
+
+    PopupWindowController {
+        id: popupController
+        objectName: "popupController"
+        webappUrlPatterns: containerWebview.webappUrlPatterns
+        mainWebappView: containerWebview.currentWebview
+        blockOpenExternalUrls: containerWebview.blockOpenExternalUrls
+        mediaAccessDialogComponent: mediaAccessDialogComponent
+        wide: containerWebview.wide
+        onInitializeOverlayViewsWithUrls: {
+            if (webappContainerWebViewLoader.item) {
+                for (var i in urls) {
+                    webappContainerWebViewLoader
+                        .item
+                        .openOverlayForUrl(urls[i])
+                }
+            }
+        }
+
+    }
+
+    Connections {
+        target: webappContainerWebViewLoader.item
+        onSamlRequestUrlPatternReceived: {
+            samlRequestUrlPatternReceived(urlPattern)
+        }
+    }
+
+    Connections {
+        target: webappContainerWebViewLoader.item
+        onThemeColorMetaInformationDetected: {
+            themeColorMetaInformationDetected(theme_color)
+        }
+    }
+
+    Loader {
+        id: webappContainerWebViewLoader
+        objectName: "containerWebviewLoader"
+        anchors.fill: parent
+        focus: true
+    }
+
+    onUrlChanged: if (webappContainerWebViewLoader.item) webappContainerWebViewLoader.item.url = url
+
+    Component.onCompleted: {
+        var webappEngineSource = Qt.resolvedUrl("WebViewImplOxide.qml");
+
+        // This is an experimental, UNSUPPORTED, API
+        // It loads an alternative webview, adjusted for a specific webapp
+        if (webviewOverrideFile.toString()) {
+            console.log("Loading custom webview from " + webviewOverrideFile);
+            webappEngineSource = webviewOverrideFile;
+        }
+
+        webappContainerWebViewLoader.setSource(
+                    webappEngineSource,
+                    { window: containerWebView.window
+                    , localUserAgentOverride: containerWebview.localUserAgentOverride
+                    , url: containerWebview.url
+                    , webappName: containerWebview.webappName
+                    , dataPath: dataPath
+                    , webappUrlPatterns: containerWebview.webappUrlPatterns
+                    , developerExtrasEnabled: containerWebview.developerExtrasEnabled
+                    , popupRedirectionUrlPrefixPattern: containerWebview.popupRedirectionUrlPrefixPattern
+                    , blockOpenExternalUrls: containerWebview.blockOpenExternalUrls
+                    , runningLocalApplication: containerWebview.runningLocalApplication
+                    , popupController: popupController
+                    , overlayViewsParent: containerWebview.parent
+                    , wide: containerWebview.wide
+                    , mediaAccessDialogComponent: mediaAccessDialogComponent
+                    , openExternalUrlInOverlay: containerWebview.openExternalUrlInOverlay
+                    , popupBlockerEnabled: containerWebview.popupBlockerEnabled})
+    }
+}
+

=== added file 'webapp-googleplus/lib/webcontainer/WebappWebview.qml'
--- webapp-googleplus/lib/webcontainer/WebappWebview.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/WebappWebview.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2016 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.4
+import com.canonical.Oxide 1.8 as Oxide
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Web 0.2
+import "../actions" as Actions
+import ".."
+
+WebViewImpl {
+    id: webappWebview
+
+    property bool wide: false
+
+    signal openUrlExternallyRequested(string url)
+
+    filePicker: filePickerLoader.item
+
+    property QtObject contextModel: null
+    contextualActions: ActionList {
+        Actions.OpenLinkInBrowser {
+            objectName: "OpenLinkInBrowser"
+            enabled: contextModel && contextModel.linkUrl.toString()
+            onTriggered: openUrlExternallyRequested(contextModel.linkUrl)
+        }
+        Actions.CopyLink {
+            enabled: contextModel && contextModel.linkUrl.toString()
+            onTriggered: Clipboard.push(["text/plain", contextModel.linkUrl.toString()])
+            objectName: "CopyLinkContextualAction"
+        }
+        Actions.SaveLink {
+            enabled: contextModel && contextModel.linkUrl.toString()
+            onTriggered: contextModel.saveLink()
+            objectName: "SaveLinkContextualAction"
+        }
+        Actions.Share {
+            objectName: "ShareContextualAction"
+            enabled: (contentHandlerLoader.status == Loader.Ready) && contextModel &&
+                     (contextModel.linkUrl.toString() || contextModel.selectionText)
+            onTriggered: {
+                if (contextModel.linkUrl.toString()) {
+                    internal.shareLink(contextModel.linkUrl.toString(), contextModel.linkText)
+                } else if (contextModel.selectionText) {
+                    internal.shareText(contextModel.selectionText)
+                }
+            }
+        }
+        Actions.CopyImage {
+            enabled: contextModel &&
+                     (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
+                     contextModel.srcUrl.toString()
+            onTriggered: Clipboard.push(["text/plain", contextModel.srcUrl.toString()])
+            objectName: "CopyImageContextualAction"
+        }
+        Actions.SaveImage {
+            enabled: contextModel &&
+                     ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
+                      (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)) &&
+                     contextModel.hasImageContents
+            onTriggered: contextModel.saveMedia()
+            objectName: "SaveImageContextualAction"
+        }
+        Actions.Undo {
+            enabled: contextModel &&
+                     contextModel.isEditable &&
+                     (contextModel.editFlags & Oxide.WebView.UndoCapability)
+            onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandUndo)
+            objectName: "UndoContextualAction"
+        }
+        Actions.Redo {
+            enabled: contextModel &&
+                     contextModel.isEditable &&
+                     (contextModel.editFlags & Oxide.WebView.RedoCapability)
+            onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandRedo)
+            objectName: "RedoContextualAction"
+        }
+        Actions.Cut {
+            enabled: contextModel &&
+                     contextModel.isEditable &&
+                     (contextModel.editFlags & Oxide.WebView.CutCapability)
+            onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandCut)
+            objectName: "CutContextualAction"
+        }
+        Actions.Copy {
+            enabled: contextModel &&
+                     contextModel.isEditable &&
+                     (contextModel.editFlags & Oxide.WebView.CopyCapability)
+            onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandCopy)
+            objectName: "CopyContextualAction"
+        }
+        Actions.Paste {
+            enabled: contextModel &&
+                     contextModel.isEditable &&
+                     (contextModel.editFlags & Oxide.WebView.PasteCapability)
+            onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandPaste)
+            objectName: "PasteContextualAction"
+        }
+        Actions.Erase {
+            enabled: contextModel &&
+                     contextModel.isEditable &&
+                     (contextModel.editFlags & Oxide.WebView.EraseCapability)
+            onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandErase)
+            objectName: "EraseContextualAction"
+        }
+        Actions.SelectAll {
+            enabled: contextModel &&
+                     contextModel.isEditable &&
+                     (contextModel.editFlags & Oxide.WebView.SelectAllCapability)
+            onTriggered: executeEditingCommand(Oxide.WebView.EditingCommandSelectAll)
+            objectName: "SelectAllContextualAction"
+        }
+    }
+    function contextMenuOnCompleted(menu) {
+        if (!menu || !menu.contextModel) {
+            return
+        }
+        contextModel = menu.contextModel
+
+        var isImageMediaType =
+                ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
+                 (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas))
+             && contextModel.hasImageContents;
+
+        if (contextModel.linkUrl.toString() ||
+            contextModel.srcUrl.toString() ||
+            contextModel.selectionText ||
+            (contextModel.isEditable && contextModel.editFlags) ||
+            isImageMediaType) {
+            menu.show()
+        } else {
+            contextModel.close()
+        }
+    }
+    Component {
+        id: contextMenuNarrowComponent
+        ContextMenuMobile {
+            actions: contextualActions
+            Component.onCompleted: webappWebview.contextMenuOnCompleted(this)
+        }
+    }
+    Component {
+        id: contextMenuWideComponent
+        ContextMenuWide {
+            associatedWebview: webappWebview
+            parent: webappWebview
+            actions: contextualActions
+            Component.onCompleted: webappWebview.contextMenuOnCompleted(this)
+        }
+    }
+    contextMenu: webappWebview.wide ? contextMenuWideComponent : contextMenuNarrowComponent
+
+    onGeolocationPermissionRequested: {
+        if (__runningConfined && (request.origin == request.embedder)) {
+            // When running confined, querying the location service will trigger
+            // a system prompt (trust store), so no need for a custom one.
+            request.allow()
+        } else {
+            requestGeolocationPermission(request)
+        }
+    }
+
+    Loader {
+        id: contentHandlerLoader
+        source: "../ContentHandler.qml"
+        asynchronous: true
+    }
+
+    QtObject {
+        id: internal
+
+        function instantiateShareComponent() {
+            var component = Qt.createComponent("../Share.qml")
+            if (component.status === Component.Ready) {
+                var share = component.createObject(webappWebview)
+                share.onDone.connect(share.destroy)
+                return share
+            }
+            return null
+        }
+
+        function shareLink(url, title) {
+            var share = instantiateShareComponent()
+            if (share) share.shareLink(url, title)
+        }
+
+        function shareText(text) {
+            var share = instantiateShareComponent()
+            if (share) share.shareText(text)
+        }
+    }
+
+    onShowDownloadDialog: {
+       if (downloadDialogLoader.status === Loader.Ready) {
+           var downloadDialog =
+                   PopupUtils.open(downloadDialogLoader.item,
+                                   webappWebview,
+                                   {"contentType" : contentType,
+                                    "downloadId" : downloadId,
+                                    "singleDownload" : downloader,
+                                    "filename" : filename,
+                                    "mimeType" : mimeType})
+           downloadDialog.startDownload.connect(startDownload)
+        }
+    }
+
+    Loader {
+        id: downloadDialogLoader
+        source: "ContentDownloadDialog.qml"
+        asynchronous: true
+    }
+
+    Loader {
+        id: filePickerLoader
+        source: "ContentPickerDialog.qml"
+        asynchronous: true
+    }
+}

=== added file 'webapp-googleplus/lib/webcontainer/webapp-container.qml'
--- webapp-googleplus/lib/webcontainer/webapp-container.qml	1970-01-01 00:00:00 +0000
+++ webapp-googleplus/lib/webcontainer/webapp-container.qml	2016-12-02 07:06:20 +0000
@@ -0,0 +1,336 @@
+/*
+ * Copyright 2013-2016 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.UnityWebApps 0.1 as UnityWebApps
+import Ubuntu.Web 0.2
+import webcontainer.private 0.1
+import ".."
+
+BrowserWindow {
+    id: root
+    objectName: "webappContainer"
+
+    property bool backForwardButtonsVisible: true
+    property bool chromeVisible: true
+
+    property string localCookieStoreDbPath: ""
+
+    property string url: ""
+    property url webappIcon: ""
+    property string webappName: ""
+    property string webappModelSearchPath: ""
+    property var webappUrlPatterns
+    property string accountProvider: ""
+    property bool accountSwitcher: false
+    property string popupRedirectionUrlPrefixPattern: ""
+    property url webviewOverrideFile: ""
+    property var __webappCookieStore: null
+    property alias webContextSessionCookieMode: webappViewLoader.webContextSessionCookieMode
+    property string localUserAgentOverride: ""
+    property bool blockOpenExternalUrls: false
+    property bool openExternalUrlInOverlay: false
+    property string defaultVideoCaptureCameraPosition: ""
+    property bool popupBlockerEnabled: true
+
+    currentWebview: webappViewLoader.item ? webappViewLoader.item.currentWebview : null
+
+    property bool runningLocalApplication: false
+
+    property bool startMaximized: false
+
+    title: getWindowTitle()
+
+    // Used for testing
+    signal schemeUriHandleFilterResult(string uri)
+
+    function getWindowTitle() {
+        var webappViewTitle =
+                webappViewLoader.item
+                ? webappViewLoader.item.title : ""
+        var name = getWebappName()
+        if (typeof(name) === 'string' && name.length !== 0) {
+            return name
+        } else if (webappViewTitle) {
+            // TRANSLATORS: %1 refers to the current page’s title
+            return i18n.tr("%1 - Ubuntu Web Browser").arg(webappViewTitle)
+        } else {
+            return i18n.tr("Ubuntu Web Browser")
+        }
+    }
+
+    Component {
+        id: webappViewComponent
+
+        WebApp {
+            id: browser
+
+            window: root
+
+            url: accountProvider.length !== 0 ? "" : root.url
+
+            accountSwitcher: root.accountSwitcher
+
+            dataPath: webappDataLocation
+            chromeVisible: root.chromeVisible
+            backForwardButtonsVisible: root.backForwardButtonsVisible
+            developerExtrasEnabled: root.developerExtrasEnabled
+            webappModelSearchPath: root.webappModelSearchPath
+            webappUrlPatterns: root.webappUrlPatterns
+            blockOpenExternalUrls: root.blockOpenExternalUrls
+            openExternalUrlInOverlay: root.openExternalUrlInOverlay
+            defaultVideoCaptureDevicePosition: root.defaultVideoCaptureCameraPosition ?
+                                                   root.defaultVideoCaptureCameraPosition
+                                                 : browser.defaultVideoCaptureDevicePosition
+            popupBlockerEnabled: root.popupBlockerEnabled
+            hasTouchScreen: root.hasTouchScreen
+
+            focus: true
+
+            popupRedirectionUrlPrefixPattern: root.popupRedirectionUrlPrefixPattern
+
+            localUserAgentOverride: getLocalUserAgentOverrideIfAny()
+
+            runningLocalApplication: root.runningLocalApplication
+            webviewOverrideFile: root.webviewOverrideFile
+
+            anchors.fill: parent
+
+            onWebappNameChanged: {
+                if (root.webappName !== browser.webappName) {
+                    root.webappName = browser.webappName;
+                    root.title = getWindowTitle();
+                }
+            }
+
+            onChooseAccount: {
+                showAccountsPage()
+                onlineAccountsController.showAccountSwitcher()
+            }
+        }
+    }
+
+    function getWebappName() {
+        /**
+          Any webapp name coming from the command line takes over.
+          A webapp can also be defined by a specific drop-in webapp-properties.json
+          file that can bundle a few specific 'properties' (as the name implies)
+          instead of having them listed in the command line.
+          */
+        if (webappName)
+            return webappName
+        return webappModelSearchPath && webappModel.providesSingleInlineWebapp()
+            ? webappModel.getSingleInlineWebappName()
+            : ""
+    }
+
+    function getLocalUserAgentOverrideIfAny() {
+        if (localUserAgentOverride.length !== 0)
+            return localUserAgentOverride
+
+        var name = getWebappName()
+        if (name && webappModel.exists(name))
+            return webappModel.userAgentOverrideFor(name)
+
+        return ""
+    }
+
+    UnityWebApps.UnityWebappsAppModel {
+        id: webappModel
+        searchPath: root.webappModelSearchPath
+
+        onModelContentChanged: {
+            var name = getWebappName()
+            if (name && root.url.length === 0) {
+                var idx = webappModel.getWebappIndex(name)
+                root.url = webappModel.data(
+                            idx, UnityWebApps.UnityWebappsAppModel.Homepage)
+            }
+        }
+    }
+
+    // Because of https://launchpad.net/bugs/1398046, it's important that this
+    // is the first child
+    Loader {
+        id: webappViewLoader
+        anchors.fill: parent
+
+        property var webContextSessionCookieMode: ""
+        property var webappDataLocation
+
+        focus: true
+
+        onLoaded: {
+            var context = item.currentWebview.context
+            onlineAccountsController.setupWebcontextForAccount(context)
+        }
+    }
+
+    OnlineAccountsController {
+        id: onlineAccountsController
+        anchors.fill: parent
+        z: -1 // This is needed to have the dialogs shown; see above comment about bug 1398046
+        providerId: accountProvider
+        applicationId: unversionedAppId
+        accountSwitcher: root.accountSwitcher
+        webappName: getWebappName()
+        webappIcon: root.webappIcon
+
+        onAccountSelected: {
+            var newWebappDataLocation = dataLocation + accountDataLocation
+            console.log("Loading webview on " + newWebappDataLocation)
+            if (newWebappDataLocation == webappViewLoader.webappDataLocation) {
+                showWebView()
+                return
+            }
+            webappViewLoader.sourceComponent = null
+            webappViewLoader.webappDataLocation = newWebappDataLocation
+            // If we need to preserve session cookies, make sure that the
+            // mode is "restored" and not "persistent", or the cookies
+            // transferred from OA would be lost.
+            // We check if the webContextSessionCookieMode is defined and, if so,
+            // we override it in the webapp loader.
+            if (willMoveCookies && typeof webContextSessionCookieMode === "string") {
+                webappViewLoader.webContextSessionCookieMode = "restored"
+            }
+            webappViewLoader.sourceComponent = webappViewComponent
+        }
+        onContextReady: startBrowsing()
+        onQuitRequested: Qt.quit()
+    }
+
+    Component.onCompleted: {
+        i18n.domain = "webbrowser-app"
+        if (forceFullscreen) {
+            showFullScreen()
+        } else if (startMaximized) {
+            showMaximized()
+        } else {
+            show()
+        }
+    }
+
+    function showWebView() {
+        onlineAccountsController.visible = false
+        webappViewLoader.visible = true
+    }
+
+    function showAccountsPage() {
+        webappViewLoader.visible = false
+        onlineAccountsController.visible = true
+    }
+
+    function startBrowsing() {
+        console.log("Start browsing")
+        // This will activate the UnityWebApp element used in WebApp.qml
+        webappViewLoader.item.webappName = root.webappName
+
+        // As we use StateSaver to restore the URL, we need to check first if
+        // it has not been set previously before setting the URL to the default property 
+        // homepage.
+        var webView = webappViewLoader.item.currentWebview
+        var current_url = webView.url.toString();
+        if (!current_url || current_url.length === 0) {
+            webView.url = root.url
+        }
+        showWebView()
+    }
+
+    function makeUrlFromResult(result) {
+        var scheme = null
+        var hostname = null
+        var url = root.currentWebview.url || root.url
+        if (result.host
+                && result.host.length !== 0) {
+            hostname = result.host
+        }
+        else {
+            var matchHostname = url.toString().match(/.*:\/\/([^/]*)\/.*/)
+            if (matchHostname.length > 1) {
+                hostname = matchHostname[1]
+            }
+        }
+
+        if (result.scheme
+                && result.scheme.length !== 0) {
+            scheme = result.scheme
+        }
+        else {
+            var matchScheme = url.toString().match(/(.*):\/\/[^/]*\/.*/)
+            if (matchScheme.length > 1) {
+                scheme = matchScheme[1]
+            }
+        }
+        return scheme
+                + '://'
+                + hostname
+                + "/"
+                + (result.path
+                    ? result.path : "")
+    }
+
+    /**
+     *
+     */
+    function translateHandlerUri(uri) {
+        //
+        var scheme = uri.substr(0, uri.indexOf(":"))
+        if (scheme.indexOf("http") === 0) {
+            schemeUriHandleFilterResult(uri)
+            return uri
+        }
+
+        var result = webappSchemeFilter.applyFilter(uri)
+        var mapped_uri = makeUrlFromResult(result)
+
+        uri = mapped_uri
+
+        // Report the result of the intent uri filtering (if any)
+        // Done for testing purposed. It is not possible at this point
+        // to have AP call a slot and retrieve its result synchronously.
+        schemeUriHandleFilterResult(uri)
+
+        return uri
+    }
+
+    function openUrls(urls) {
+        // only consider the first one (if multiple)
+        if (urls.length === 0 || !root.currentWebview) {
+            return;
+        }
+        var requestedUrl = urls[0].toString();
+
+        if (popupRedirectionUrlPrefixPattern.length !== 0
+                && requestedUrl.match(popupRedirectionUrlPrefixPattern)) {
+            return;
+        }
+
+        requestedUrl = translateHandlerUri(requestedUrl);
+
+        // Add a small guard to prevent browsing to invalid urls
+        if (currentWebview
+                && currentWebview.shouldAllowNavigationTo
+                && !currentWebview.shouldAllowNavigationTo(requestedUrl)) {
+            return;
+        }
+
+        root.url = requestedUrl
+        root.currentWebview.url = requestedUrl
+    }
+}

=== modified file 'webapp-googleplus/manifest.json'
--- webapp-googleplus/manifest.json	2016-02-11 11:03:08 +0000
+++ webapp-googleplus/manifest.json	2016-12-02 07:06:20 +0000
@@ -15,5 +15,5 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.googleplus",
     "title": "Google+",
-    "version": "0.7.2"
+    "version": "0.7.3"
 }

=== modified file 'webapp-googleplus/webview-override.qml'
--- webapp-googleplus/webview-override.qml	2016-02-10 15:23:59 +0000
+++ webapp-googleplus/webview-override.qml	2016-12-02 07:06:20 +0000
@@ -24,19 +24,10 @@
 import Ubuntu.UnityWebApps 0.1 as UnityWebApps
 import Ubuntu.Web 0.2
 import Ubuntu.Content 0.1
-import "./actions" as Actions
-import "./lib"
-
-Item {
-    id: webviewWrapper
-
-    property bool developerExtrasEnabled: false
-    property string webappName: ""
-    property string localUserAgentOverride: ""
-    property var webappUrlPatterns: null
-    property string url: ""
-    property var currentWebview: webview ? webview.currentWebview : null
-    property url dataPath
+import "./lib/webcontainer"
+
+WebViewImplOxide {
+    id: webview
 
     property var activeFileUrisToShare: []
     property var activeTransfer
@@ -117,7 +108,7 @@
     Component {
         id: contentHubSharePassthroughPickerComponent
         Item {
-            anchors.fill: webviewWrapper
+            anchors.fill: webview
             Component.onCompleted: {
                 model.accept(activeFileUrisToShare)
                 clearContentHubShareState()
@@ -171,289 +162,19 @@
                 }
             }
             webview.onLoadingChanged.connect(onLoadChanged)
-            webview.url = webviewWrapper.url
         }
     }
 
-    // unused
-    property string popupRedirectionUrlPrefixPattern: ""
-    property bool blockOpenExternalUrls: false
-
-    WebViewImpl {
-        id: webview
-        anchors.fill: parent
-
-        currentWebview: webview
-
-        context: WebContext {
-            dataPath: webviewWrapper.dataPath
-            userAgent: localUserAgentOverride ? localUserAgentOverride : defaultUserAgent
-
-            userScripts: [
-                Oxide.UserScript {
-                    context: "oxide://share-request-context/"
-                    url: Qt.resolvedUrl("share-request-host.js")
-                    matchAllFrames: false
-                }
-            ]
-        }
-
-        preferences.allowFileAccessFromFileUrls: runningLocalApplication
-        preferences.allowUniversalAccessFromFileUrls: runningLocalApplication
-
-        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])
-            }
-        }
-
-        StateSaver.properties: "url"
-        StateSaver.enabled: !runningLocalApplication
-
-        function isRunningAsANamedWebapp() {
-            return webview.webappName && typeof(webview.webappName) === 'string' && webview.webappName.length != 0
-        }
-
-        function haveValidUrlPatterns() {
-            return webappUrlPatterns && webappUrlPatterns.length !== 0
-        }
-
-        function isNewForegroundWebViewDisposition(disposition) {
-            return disposition === Oxide.NavigationRequest.DispositionNewPopup ||
-                    disposition === Oxide.NavigationRequest.DispositionNewForegroundTab;
-        }
-
-        function openUrlExternally(url) {
-            Qt.openUrlExternally(url)
-        }
-
-        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 (haveValidUrlPatterns()) {
-                for (var i = 0; i < webappUrlPatterns.length; ++i) {
-                    var pattern = webappUrlPatterns[i]
-                    if (url.match(pattern)) {
-                        return true;
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        function navigationRequestedDelegate(request) {
-            var newForegroundPageRequest = isNewForegroundWebViewDisposition(request.disposition)
-            var url = request.url.toString()
-
-            console.log("navigationRequestedDelegate - newForegroundPageRequest: "
-                        + newForegroundPageRequest
-                        + ', url: ' + url)
-
-            if (runningLocalApplication && url.indexOf("file://") !== 0) {
-                request.action = Oxide.NavigationRequest.ActionReject
-                openUrlExternally(url)
-                return
-            }
-
-            // Covers some edge cases corresponding to the default window.open() behavior.
-            // When it is being called, the targetted URL will not load right away but
-            // will first round trip to an "about:blank".
-            // See https://developer.mozilla.org/en-US/docs/Web/API/Window.open
-            if (newForegroundPageRequest) {
-                if (url == 'about:blank') {
-                    console.log('Accepting a new window request to navigate to "about:blank"')
-                    request.action = Oxide.NavigationRequest.ActionAccept
-                    return
-                }
-
-                var isRedirectionUrl = false;
-                var targetUrl = url;
-                if (popupRedirectionUrlPrefixPattern) {
-                    // NOTE: very nasty workaround to be backward compatibility, will be deleted as soon
-                    // as the FB webapp is updated.
-                    if (popupRedirectionUrlPrefixPattern.indexOf('(') === -1) {
-                        isRedirectionUrl = (url.indexOf(popupRedirectionUrlPrefixPattern) === 0);
-                        targetUrl = isRedirectionUrl ?
-                                    url.slice(popupRedirectionUrlPrefixPattern.length) : url;
-
-                        // Quick fix for http://pad.lv/1358622 (trim trailing parameters).
-                        var extraParams = targetUrl.indexOf("&");
-                        if (extraParams !== -1) {
-                            targetUrl = targetUrl.slice(0, extraParams);
-                        }
-                    } else {
-                        var redirectionPatternMatch = url.match(popupRedirectionUrlPrefixPattern);
-                        isRedirectionUrl =
-                                popupRedirectionUrlPrefixPattern
-                                && redirectionPatternMatch
-                                && redirectionPatternMatch.length >= 2;
-
-                        // Assume that the first group is the matching one
-                        targetUrl = isRedirectionUrl ?
-                                    redirectionPatternMatch[1] : url;
-                    }
-                }
-
-                if (isRedirectionUrl) {
-                    console.debug("Got a redirection URL with target URL: " + targetUrl)
-                    targetUrl = decodeURIComponent(targetUrl)
-                    gotRedirectionUrl(targetUrl)
-                }
-
-                if (webview.shouldAllowNavigationTo(targetUrl)) {
-                    console.debug('Redirecting popup browsing ' + targetUrl + ' in the current container window.')
-                    request.action = Oxide.NavigationRequest.ActionReject
-                    webappContainerHelper.browseToUrlRequested(webview, targetUrl)
-                    return
-                }
-
-                console.debug('Opening popup window ' + targetUrl + ' in the browser window.')
-                request.action = Oxide.NavigationRequest.ActionReject
-                openUrlExternally(targetUrl)
-                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 ( ! webview.haveValidUrlPatterns() && ! webview.isRunningAsANamedWebapp()) {