Merge lp:~abreu-alexandre/webbrowser-app/specify-embedded-ui-parent into lp:webbrowser-app

[Alexandre Abreu]

Specify a parent for embedded uis being launched by webapps

Specify a parent for embedded uis being launched by webapps

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1368
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2641/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1394
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1394/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1394
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5063
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6681
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6681/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27939

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

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

LGTM!

review: Approve

=== modified file 'src/app/webcontainer/WebApp.qml'
--- src/app/webcontainer/WebApp.qml	2016-02-09 17:04:23 +0000
+++ src/app/webcontainer/WebApp.qml	2016-02-26 19:31:10 +0000
@@ -260,6 +260,7 @@
         id: unityWebapps
         name: webappName
         bindee: containerWebView.currentWebview
+        embeddedUiComponentParent: webapp
         actionsContext: actionManager.globalContext
         model: UnityWebApps.UnityWebappsAppModel { searchPath: webappModelSearchPath }
         injectExtraUbuntuApis: runningLocalApplication