Merge lp:~mardy/ubuntu-system-settings-online-accounts/popups-1428591 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Open popups in an overlaid webview

Open popups in an overlaid wabview

[lp:~mardy/ubuntu-system-settings-online-accounts/popups-1428591]

347. By Alberto Mardegan on 2016-05-25

Install new QML file

348. By Alberto Mardegan on 2016-05-25

skip tests on arm64

349. By Alberto Mardegan on 2016-05-25

Add missing import

350. By Alberto Mardegan on 2016-06-06

Revert arm64 change, will be fixed in a separate MP

=== added file 'plugins/module/ChromedWebView.qml'
--- plugins/module/ChromedWebView.qml	1970-01-01 00:00:00 +0000
+++ plugins/module/ChromedWebView.qml	2016-06-06 12:10:41 +0000
@@ -0,0 +1,18 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+import Ubuntu.Web 0.2
+
+WebView {
+    id: root
+
+    /* Taken from webbrowser-app */
+    ProgressBar {
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: units.dp(3)
+        showProgressPercentage: false
+        visible: root.loading
+        value: root.loadProgress / 100
+    }
+}
 
=== modified file 'plugins/module/WebView.qml'
--- plugins/module/WebView.qml	2016-02-24 10:29:24 +0000
+++ plugins/module/WebView.qml	2016-06-06 12:10:41 +0000
@@ -2,11 +2,29 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Web 0.2
 
-WebView {
+ChromedWebView {
     id: root
 
     property QtObject signonRequest
 
+    onNewViewRequested: {
+        var popup = popupComponent.createObject(root, {
+            "context": context,
+            "request": request,
+        })
+        popup.closeRequested.connect(function() {
+            console.log("Close requested!")
+            popup.destroy()
+        })
+    }
+
+    Component {
+        id: popupComponent
+        ChromedWebView {
+            anchors.fill: parent
+        }
+    }
+
     onSignonRequestChanged: if (signonRequest) {
         signonRequest.authenticated.connect(onAuthenticated)
         url = signonRequest.startUrl
@@ -39,15 +57,4 @@
     function onGotCookies(requestId, cookies) {
         signonRequest.setCookies(cookies)
     }
-
-    /* Taken from webbrowser-app */
-    ProgressBar {
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        height: units.dp(3)
-        showProgressPercentage: false
-        visible: root.loading
-        value: root.loadProgress / 100
-    }
 }
 
=== modified file 'plugins/module/module.pro'
--- plugins/module/module.pro	2016-03-08 08:48:26 +0000
+++ plugins/module/module.pro	2016-06-06 12:10:41 +0000
@@ -34,6 +34,7 @@
 LIBS += -lonline-accounts-plugin
 
 QML_SOURCES = \
+    ChromedWebView.qml \
     DuplicateAccount.qml \
     ErrorItem.qml \
     KeyboardRectangle.qml \