Merge lp:~nick-dedekind/unity-mir/trusted-sessions into lp:unity-mir

[Nick Dedekind]

Shell implementation of Mir trust sessions.

Shell implementation of Mir trust sessions.
Requires lp:~nick-dedekind/mir/trusted_sessions to land

A mir trust session consists of any number of mir sessions arranged into a parent hierarchy. The last child of the hierarchy is the session which is considered to be the top focused session at all times if the unity-mir Application is in focus.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:178
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/294/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/157/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/158/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/157/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/294/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/325/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/189/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/188/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/325/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/345/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/345/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/347/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/347/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/348/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/348/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/354/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/354/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/355/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/355/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/356/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/20/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/356/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/358/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/22/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/358/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:197
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/364/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/364/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:199
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/365/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/365/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:200
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/369/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/33/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/33/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/369/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:201
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/371/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/371/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/372/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/36/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/372/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Is this actually ready for review? If not, please mark as Work in Progress

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:205
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nick-dedekind/unity-mir/trusted-sessions/+merge/223432/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:206
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nick-dedekind/unity-mir/trusted-sessions/+merge/223432/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:207
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nick-dedekind/unity-mir/trusted-sessions/+merge/223432/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/18/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:209
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nick-dedekind/unity-mir/trusted-sessions/+merge/223432/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/19/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:210
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nick-dedekind/unity-mir/trusted-sessions/+merge/223432/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Commit message please. Checklist too.

review: Needs Fixing

[Gerry Boland (gerboland)]

- std::shared_ptr<::mir::scene::Session> m_session;
+ mutable mir::scene::Session* m_lastTopSession;

So now Application doesn't have a shared_ptr to a Mir Session object. Reason unity-mir held onto that was so that the Session object was only deleted when both Mir and unity-mir had released it, as it may take time for the Application to be removed from the app list, and QML could be asking for properties of that Session after Mir was done with it.

review: Needs Fixing

[Gerry Boland (gerboland)]

=== modified file 'debian/control'
not necessary change for this MR, please revert

[Gerry Boland (gerboland)]

Taking the smaller bits first

=== added file 'src/modules/Unity/Application/promptsession.h'
+ // Qt
+#include <QSharedPointer>
not needed in header

namespace mir
+{
+namespace scene
+{
+class Session;
+class PromptSession;
+class PromptSessionManager;
please indent like in ApplicationManager

In PromptSession constructor, line 45, please line up the arguments (space missing)

+ virtual ~PromptSession();
Why virtual? Could use "= default" to have default deconstructor generated, saving you these few lines:
 +Session::~Session()
+{
+}

+ std::shared_ptr<mir::scene::Session> topProvider() const;
I find the name confusing. What is a "provider"? It returns a Session. "top" also isn't useful, unless you happen to know the internals of unity-mir::PromptSession is a stack.

+ std::shared_ptr<mir::scene::PromptSession> mirPromptSession() const;
shows that we can now easily confuse mir's PromptSession with unity-mir's PromptSession. Perhaps a slightly different class name? PromptSessionWrapper?

+Q_DECLARE_METATYPE(unitymir::PromptSession*)
Why do you need to register it as a type with MOC?

=== added file 'src/modules/Unity/Application/promptsession.cpp'
+#include <QDebug>
not used

+PromptSession::PromptSession(const std::shared_ptr<mir::scene::PromptSession>& promptSession, const std::shared_ptr<mir::scene::PromptSessionManager>& promptSessionManager)
please wrap. I'm not strict, but 120 chars is reasonable.

+ m_promptSessionManager->for_each_provider_in(m_promptSession,
+ [&child](std::shared_ptr<mir::scene::Session> const& provider) {
+ child = provider;
+ });
Really? Is there no way to identify the "top" one other than iterating the whole list/stack?!

+ auto helper = m_promptSessionManager->helper_for(m_promptSession);
I only like using auto if the type is really obvious. In this case it's not, I'd prefer you either declare the type, or use name "helperSession"

+ [&](std::shared_ptr<mir::scene::Session> const& provider) {
You only need to capture "found" here, not all locals.

+ }
please add comment to the namespace closing brace, it's a style I'm trying to maintain in this project.

=== added file 'src/modules/Unity/Application/session.h'
What's the point of this entire class? Do you need to share a mir Session with multiple Applications??

=== added file 'src/unity-mir/promptsessionlistener.cpp'
+ * Copyright (C) 2013 Canonical, Ltd.
2014

+ DLOG("PromptSessionListener::prompt_provider_added (this=%p, prompt_session=%p, prompt_provider=%p)", this, &prompt_session, (void*)prompt_provider.get());
+ DLOG("PromptSessionListener::prompt_provider_removed (this=%p, prompt_session=%p, prompt_provider=%p)", this, &prompt_session, (void*)prompt_provider.get());
please wrap

Same for the header file, prompt_provider_{added,removed} should be wrapped

=== modified file 'src/unity-mir/qmirserver.cpp'
Unnecessary change, please revert

=== modified file 'src/unity-mir/sessionauthorizer.cpp'
Unnecessary change, please revert

=== modified file 'src/modules/Unity/Application/proc_info.h'
+ virtual quint64 ppid(quint64 pid);
what does that mean? Parent process id? Does process-cpp not have a method to get that?

=== modified file 'src/mo...

review: Needs Fixing

[Gerry Boland (gerboland)]

=== modified file 'src/modules/Unity/Application/mirsurface.h'
- explicit MirSurface(std::shared_ptr<mir::scene::Surface> surface, Application* application, QQuickItem *parent = 0);
1069 + explicit MirSurface(std::shared_ptr<mir::scene::Surface> surface, QSharedPointer<Session> const& session, QQuickItem *parent = 0);

I object strongly, why create distinction between an Application and a Session? Why does a shell need to know about Sessions?

In my vocabulary, Applications have Surfaces, and that's all a shell needs to know to operate. Those Surfaces can have relationships and properties, which shell can use to treat them differently.

Why do you need this?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/21/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/22/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> Taking the smaller bits first
>
>
>
> === added file 'src/modules/Unity/Application/promptsession.h'
> + // Qt
> +#include <QSharedPointer>
> not needed in header
>
> namespace mir
> +{
> +namespace scene
> +{
> +class Session;
> +class PromptSession;
> +class PromptSessionManager;
> please indent like in ApplicationManager
>
> In PromptSession constructor, line 45, please line up the arguments (space
> missing)
>
> + virtual ~PromptSession();
> Why virtual? Could use "= default" to have default deconstructor generated,
> saving you these few lines:
> +Session::~Session()
> +{
> +}
>
> + std::shared_ptr<mir::scene::Session> topProvider() const;
> I find the name confusing. What is a "provider"? It returns a Session. "top"
> also isn't useful, unless you happen to know the internals of unity-
> mir::PromptSession is a stack.
>
> + std::shared_ptr<mir::scene::PromptSession> mirPromptSession() const;
> shows that we can now easily confuse mir's PromptSession with unity-mir's
> PromptSession. Perhaps a slightly different class name? PromptSessionWrapper?
>
> +Q_DECLARE_METATYPE(unitymir::PromptSession*)
> Why do you need to register it as a type with MOC?
>
>
> === added file 'src/modules/Unity/Application/promptsession.cpp'
> +#include <QDebug>
> not used
>
> +PromptSession::PromptSession(const
> std::shared_ptr<mir::scene::PromptSession>& promptSession, const
> std::shared_ptr<mir::scene::PromptSessionManager>& promptSessionManager)
> please wrap. I'm not strict, but 120 chars is reasonable.

removed unitymir::PromptSession

>
> + m_promptSessionManager->for_each_provider_in(m_promptSession,
> + [&child](std::shared_ptr<mir::scene::Session> const& provider) {
> + child = provider;
> + });
> Really? Is there no way to identify the "top" one other than iterating the
> whole list/stack?!

nope. but there won't be many (like only one/two...)

>
> + auto helper = m_promptSessionManager->helper_for(m_promptSession);
> I only like using auto if the type is really obvious. In this case it's not,
> I'd prefer you either declare the type, or use name "helperSession"
>
> + [&](std::shared_ptr<mir::scene::Session> const& provider) {
> You only need to capture "found" here, not all locals.
>
> + }
> please add comment to the namespace closing brace, it's a style I'm trying to
> maintain in this project.
>
>
>
>
> === added file 'src/modules/Unity/Application/session.h'
> What's the point of this entire class? Do you need to share a mir Session with
> multiple Applications??
>

removed unitymir::Session

>
> === added file 'src/unity-mir/promptsessionlistener.cpp'
> + * Copyright (C) 2013 Canonical, Ltd.
> 2014
>
> + DLOG("PromptSessionListener::prompt_provider_added (this=%p,
> prompt_session=%p, prompt_provider=%p)", this, &prompt_session,
> (void*)prompt_provider.get());
> + DLOG("PromptSessionListener::prompt_provider_removed (this=%p,
> prompt_session=%p, prompt_provider=%p)", this, &prompt_session,
> (void*)prompt_provider.get());
> please wrap
>
> Same for the header file, prompt_provider_{added,removed} should be wrapped
>

done

>
>
> === modified file 'src/unity-mir/qmirserver.cpp'
> Unnecessary change, please reve...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/23/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:219
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/24/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Thanks for the design changes, I'm much happier with it now. I've mostly small annoying things to request. Taking everything except AppManager and the tests (will check them last):

=== modified file 'src/modules/Unity/Application/application.h'
+ std::shared_ptr<mir::scene::PromptSessionManager> const promptSessionManager,
Could pass by reference to save a copy?

Also, you've seen that the current variable declaration syntax mess that is the "const Type& name" and "Type const& name" confusion. I need to tidy it up, but I'm slowly standardizing everything to "const Type &name" - would you hate me if I asked you to do the same, just in the bits you added? It's ok to say no :)

+ std::shared_ptr<mir::scene::Session> effectiveSession() const;
I think "foregroundSession" is a clearer name than effectiveSession.

session() is also not a great name now, but changing it everywhere would be lots more work, so we can leave it for now.

std::shared_ptr<mir::scene::PromptSession> Application::promptSession() const;
There could be multiple such prompt sessions, but this returns only the most recently created one. Maybe better name is "foremostPromptSession" or "activePromptSession"?

+ mutable mir::scene::Session* m_lastTopSession;
"Top" -> "Foreground" please.

Note that ApplicationManager is a friend of Application, so all your additional public methods can be made private, as they're not useful to shell/QML.

+ void pushPromptSession(const std::shared_ptr<mir::scene::PromptSession>& session);
+ void removePromptSession(const std::shared_ptr<mir::scene::PromptSession>& session);
Could you rename the first to "append" - if I see "push" I expect a "pop", else "add/append" and "remove" pair nicely

=== modified file 'src/modules/Unity/Application/application.cpp'
+ mir::scene::PromptSession
please add "namespace ms = mir::scene" to the top of the file and write "ms::PromptSession" everywhere, helps to hide some of Mir's namespace verbosity.

+ std::shared_ptr<mir::scene::PromptSession> prompt_session
camelCase please.

+ std::shared_ptr<mir::scene::Session> child;
'child' could be declared outside the while loop, save create/destroy on each iteration.

+ if (m_pid == pid) {
2 spaces after m_pid. Braces not really needed either for this 1-liner (which is your usual style).

+void Application::pushPromptSession(const std::shared_ptr<mir::scene::PromptSession>& prompt_session)
camelCase please

+void Application::removePromptSession
A warning if no matching prompt session was found would not hurt, and might save future debugging pain.

=== modified file 'src/modules/Unity/Application/mirsurface.h'
Whitespace change, not needed in this MR.

Ok, last need to read AppMan, the tests, and do functional testing.

review: Needs Fixing

[Gerry Boland (gerboland)]

=== added file 'src/unity-mir/promptsessionlistener.cpp'
+#include <QThread>
needed?

[Nick Dedekind (nick-dedekind)]

+void Application::removePromptSession
A warning if no matching prompt session was found would not hurt, and might save future debugging pain

It calls this on applications which may not necessarily have the prompt session (loops through all apps). More efficient than checking, then removing.

[Nick Dedekind (nick-dedekind)]

Fixed others.

[Gerry Boland (gerboland)]

ApplicationManager:

=== modified file 'src/modules/Unity/Application/application_manager.h'
+ std::shared_ptr<mir::shell::FocusController> const& focusController,
+ const std::shared_ptr<mir::scene::PromptSessionManager>& promptSessionManager,
Consistency please

+ Application* findApplicationWithPid(const qint64 pid, bool checkSessions)
+ Application* findApplicationWithSession(const std::shared_ptr<mir::scene::Session> &session, bool checkSessions);
+ Application* findApplicationWithSession(const mir::scene::Session *session, bool checkSessions);
"checkSessions" - better name would be more like "includeChildSessions" or something like that, WDYT?

+ void onApplicationEffectiveSessionChanged();
s/Effective/Foreground/

+ if (info->contains("trust-session-demo-trusted-helper") ||
+ info->contains("unity8") ||
+ (ppid != 0 && m_procInfo->commandLine(ppid)->contains("trust-session-demo-trusted-helper"))) {
That's pretty messy. Why considering an app with "unity8" in the process name as a trusted helper? So you're allowing any process directly spawned by the trusted helper. I guess that's all we can do, until our internal discussions conclude.

+ info->asStringList()[0].toLatin1().data());
qPrintable(info->asStringList().first()) an alternative, up to you

+ if (m_fencePIDs.contains(pid)) {
It looks like you've changed m_fencePIDs contains the PIDs of all whitelisted and trusted helpers while they are running. That's ok, but "fence" is not a good name now - perhaps "ignored" or "hidden" ?

+ if (!session) { return NULL; }
2 lines, no braces please. "nullptr" too.

Ok, just tests to go

[Gerry Boland (gerboland)]

Tests
=== modified file 'tests/application_manager_test.cpp'

+ Application* startApplication(quint64 procId, QString const& appId)
Not a bad idea.

+ auto session1 = std::make_shared<MockSession>(appId.toStdString(), procId);
+ auto promptSession = std::make_shared<MockPromptSession>();

I don't see these being used anywhere though.

TEST_F(ApplicationManagerTests,onceAppAddedToApplicationLists_mirSurfaceCreatedEventHandled)
+ std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
+++
why did you move these lines before the focusSpy?

+ std::shared_ptr<mir::scene::Surface> providerSurface((mir::scene::Surface*)__LINE__, [](mir::scene::Surface*) {}); // use mock!
What does that do? Is that comment a TODO?

+ {
+ return 0;
strange indent

[Gerry Boland (gerboland)]

Ah, can you re-propose against lp:unity-mir please?

lp:unity-mir/devel really only for Mir devel compatibility changes

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/25/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/26/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> Tests
> === modified file 'tests/application_manager_test.cpp'
>
> + Application* startApplication(quint64 procId, QString const& appId)
> Not a bad idea.
>
> + auto session1 = std::make_shared<MockSession>(appId.toStdString(), procId);
> + auto promptSession = std::make_shared<MockPromptSession>();
>
> I don't see these being used anywhere though.
>

Moved AppMan.onSessionstart(session1) to startApplication.
Removed other.

>
>
> TEST_F(ApplicationManagerTests,onceAppAddedToApplicationLists_mirSurfaceCreate
> dEventHandled)
> + std::shared_ptr<mir::scene::Session> session =
> std::make_shared<MockSession>("", procId);
> +++
> why did you move these lines before the focusSpy?
>

This was because of the foregroundSessionChanged signal causing a screenshot dataChanged. However, there was a bit of code duplication in the AppMan which I removed. So I've changed it back.

>
> + std::shared_ptr<mir::scene::Surface>
> providerSurface((mir::scene::Surface*)__LINE__, [](mir::scene::Surface*) {});
> // use mock!
> What does that do? Is that comment a TODO?

Made comment a TODO
mmmm. that's a shared_ptr with a custom deleter (an empty deleter in this case. Ever seen mir::test::fake_shared?).
It's using the line number as a pointer address so that calling Session::default_surface does not return nullptr, which is a condition for a Application::foregroundSession sourced by a PromptSession.
Not ideal, but that's why the TODO is there.

>
> + {
> + return 0;
> strange indent

Done

[lp:~nick-dedekind/unity-mir/trusted-sessions]

228. By Nick Dedekind on 2014-06-25

removed whitespace

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:228
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nick-dedekind/unity-mir/trusted-sessions/+merge/224397/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/31/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/31/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:227
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nick-dedekind/unity-mir/trusted-sessions/+merge/224397/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-ci/383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/47

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/383/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:228
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nick-dedekind/unity-mir/trusted-sessions/+merge/224397/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-mir-ci/386/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/50/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/386/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity-mir/trusted-sessions]

229. By Nick Dedekind on 2014-07-02

merged with trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/387/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/51/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/387/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity-mir/trusted-sessions]

230. By Nick Dedekind on 2014-07-03

fixed build

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/388/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/388/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

This needed?
+ info->contains("unity8") ||

Functional testing with your demo trust sessions app. For anyone else playing along at home, I did:
  bzr branch lp:~nick-dedekind/+junk/trusted_sessions_app
  sudo apt-get build-dep unity-mir
  mkdir BUILD && cd BUILD
  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
  make -j4
On the phone I launched calculator & clock. Calculator in the foreground, I ran:
  ./trust-session-demo-trusted-helper -p `pgrep -f calculator`

Which worked fine.

Problem cases:
1. if calculator in the background (clock in foreground) and its trust helper opened, the trust helper appears on top of the clock app.
2. continuing problem 1, if you do a right-edge swipe to reveal spread, the preview for calculator is empty (just see a weird shadow). Tapping it brings back the trust helper screen though
3. if you open calculator's trust helper, then left-edge swipe, the trust helper closes. Intended?
4. strange things happen if I try to open 2 trust prompt sessions, one for 2 different apps. I guess that's kinda unlikely.
5. For 1 app, I opened 2 trust helpers running simultaneously. When I returned to Dash, then went back to the app, one trust helper had quit, but the other had not. Another odd situation I'm creating?
6. Clock in foreground, opened trust helper for it. Then in shell, caused app to die unexpectedly with "kill -9 `pgrep -f clock`" - shell crashed

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/389/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/389/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> This needed?
> + info->contains("unity8") ||

Yes for now. When we create new sockets for the providers, the mir authorizes with the server pid, which is unity8 (since there is nothing connected to the socket yet).
It's possible that this is not right in mir and the session needs auth only when the connection is made by a client...
This will go away when we start using the trust socket (which skips the auth), as children inherit their parent's permission.

>
> Functional testing with your demo trust sessions app. For anyone else playing
> along at home, I did:
> bzr branch lp:~nick-dedekind/+junk/trusted_sessions_app
> sudo apt-get build-dep unity-mir
> mkdir BUILD && cd BUILD
> cmake .. -DCMAKE_INSTALL_PREFIX=/usr
> make -j4
> On the phone I launched calculator & clock. Calculator in the foreground, I
> ran:
> ./trust-session-demo-trusted-helper -p `pgrep -f calculator`
>
> Which worked fine.
>
>
>
> Problem cases:
> 1. if calculator in the background (clock in foreground) and its trust helper
> opened, the trust helper appears on top of the clock app.

Will take a look.
Technically I think this is a mir issue. It shouldn't be focusing to newly created sessions; that should be focus policy controlled by shell... Bad Mir!
Will need to jiggery poke it.

> 2. continuing problem 1, if you do a right-edge swipe to reveal spread, the
> preview for calculator is empty (just see a weird shadow). Tapping it brings
> back the trust helper screen though

Hm. When we add a provider to a prompt session, I take a new application snapshot. This however does not guarantee that anything has yet been drawn on the surface of the prompt provider surface... Not sure how to fix this.

> 3. if you open calculator's trust helper, then left-edge swipe, the trust
> helper closes. Intended?

yes. at the moment, trust helpers do not survive context switches.

> 4. strange things happen if I try to open 2 trust prompt sessions, one for 2
> different apps. I guess that's kinda unlikely.

Mmm.. multiple prompt sessions are not yet supported.

> 5. For 1 app, I opened 2 trust helpers running simultaneously. When I returned
> to Dash, then went back to the app, one trust helper had quit, but the other
> had not. Another odd situation I'm creating?

As above

> 6. Clock in foreground, opened trust helper for it. Then in shell, caused app
> to die unexpectedly with "kill -9 `pgrep -f clock`" - shell crashed

I've taken a quick look and it seems to be crashing when taking a screenshot of a session which is being closed. Haven't dug into to it, but it doesn't seem related to trust sessions, only a result of their usage.

[lp:~nick-dedekind/unity-mir/trusted-sessions]

231. By Nick Dedekind on 2014-07-08

fixed dlog

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/390/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/54

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/390/rebuild

review: Approve (continuous-integration)

[lp:~nick-dedekind/unity-mir/trusted-sessions]

232. By Nick Dedekind on 2014-07-10

merged with lp:~nick-dedekind/unity-mir/thready-screenshotting

233. By Nick Dedekind on 2014-07-11

remerged with thready branch

234. By Nick Dedekind on 2014-07-15

remove authorise dodgeys for prompt sessions

235. By Nick Dedekind on 2014-07-15

reverted changes to debian/control & debian/changelog

236. By Nick Dedekind on 2014-07-15

bumped to 0.5

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-01 14:19:04 +0000
+++ debian/changelog	2014-07-10 11:50:19 +0000
@@ -1,21 +1,3 @@
-unity-mir (0.4+14.10.20140701.1-0ubuntu1) utopic; urgency=low
-
-  [ Alexandros Frantzis ]
-  * Use surface relative coordinates when setting the input region for
-    the input area Mir changed at some point to use surface relative
-    coordinates for input regions. (LP: #1332624)
-
-  [ Gerry Boland ]
-  * Bump Mir dependencies to 0.4.0.
-
-  [ Cemil Azizoglu ]
-  * Bump Mir dependencies to 0.4.0.
-
-  [ Alberto Aguirre ]
-  * Bump Mir dependencies to 0.4.0.
-
- -- Ubuntu daily release <[e-mail]>  Tue, 01 Jul 2014 14:19:04 +0000
-
 unity-mir (0.4+14.10.20140625.2-0ubuntu1) utopic; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/control'
--- debian/control	2014-06-27 01:05:20 +0000
+++ debian/control	2014-07-10 11:50:19 +0000
@@ -9,8 +9,8 @@
                libboost-dev,
                libboost-system-dev,
                libubuntu-application-api-dev (>= 2.0.0),
-               libmirserver-dev (>= 0.4.0),
-               libmirclient-dev (>= 0.4.0),
+               libmirserver-dev (>= 0.3.0),
+               libmirclient-dev (>= 0.1.9),
                libprocess-cpp-dev,
                libunity-api-dev (>= 7.80.6),
                libubuntu-app-launch2-dev,

=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2014-05-26 15:54:44 +0000
+++ src/modules/Unity/Application/application.cpp	2014-07-10 11:50:19 +0000
@@ -26,6 +26,15 @@
 // mir
 #include <mir/scene/session.h>
 #include <mir/scene/snapshot.h>
+#include <mir/scene/prompt_session.h>
+#include <mir/scene/prompt_session_manager.h>
+
+namespace ms = mir::scene;
+
+// other
+#include <mutex>
+
+std::mutex screenshotMutex;
 
 namespace unitymir
 {
@@ -34,6 +43,7 @@
                          DesktopFileReader *desktopFileReader,
                          State state,
                          const QStringList &arguments,
+                         const std::shared_ptr<ms::PromptSessionManager>& promptSessionManager,
                          QObject *parent)
     : ApplicationInfoInterface(desktopFileReader->appId(), parent)
     , m_taskController(taskController)
@@ -47,6 +57,8 @@
     , m_visible(false)
     , m_arguments(arguments)
     , m_suspendTimer(new QTimer(this))
+    , m_promptSessionManager(promptSessionManager)
+    , m_screenShotGuard(std::make_shared<Guard>())
 {
     DLOG("Application::Application (this=%p, appId=%s, state=%d", this, qPrintable(desktopFileReader->appId()),
          static_cast<int>(state));
@@ -56,10 +68,17 @@
 
     // FIXME(greyback) need to save long appId internally until upstart-app-launch can hide it from us
     m_longAppId = desktopFileReader->file().remove(QRegExp(".desktop$")).split('/').last();
+
+    connect(this, &Application::foregroundSessionChanged, this, &Application::updateScreenshot);
 }
 
 Application::~Application()
 {
+    {
+        std::lock_guard<std::mutex> lk(screenshotMutex);
+        m_screenShotGuard.reset();
+    }
+
     DLOG("Application::~Application (this=%p)", this);
     delete m_desktopData;
 }
@@ -133,11 +152,66 @@
     return m_fullscreen;
 }
 
-std::shared_ptr<mir::scene::Session> Application::session() const
+std::shared_ptr<ms::Session> Application::session() const
 {
     return m_session;
 }
 
+std::shared_ptr<ms::Session> Application::foregroundSession() const
+{
+    std::shared_ptr<ms::Session> child;
+
+    QListIterator<std::shared_ptr<ms::PromptSession>> iter(m_promptSessions);
+    iter.toBack();
+    while (iter.hasPrevious()) {
+        std::shared_ptr<ms::PromptSession> promptSession = iter.previous();
+
+        // get top session
+        m_promptSessionManager->for_each_provider_in(promptSession,
+            [&child](std::shared_ptr<ms::Session> const& provider) {
+                if (provider->default_surface() != nullptr)
+                    child = provider;
+            });
+
+        if (child)
+            return child;
+    }
+
+    return session();
+}
+
+std::shared_ptr<ms::PromptSession> Application::activePromptSession() const
+{
+    if (m_promptSessions.count() > 0)
+        return m_promptSessions.back();
+    return nullptr;
+}
+
+bool Application::containsProcess(pid_t pid) const
+{
+    if (m_pid == pid)
+        return true;
+
+    QListIterator<std::shared_ptr<ms::PromptSession>> iter(m_promptSessions);
+    while(iter.hasNext()) {
+        std::shared_ptr<ms::PromptSession> promptSession = iter.next();
+
+        std::shared_ptr<ms::Session> helper = m_promptSessionManager->helper_for(promptSession);
+        if (helper && helper->process_id() == pid)
+            return true;
+
+        bool found = false;
+        m_promptSessionManager->for_each_provider_in(promptSession,
+            [&found, pid](std::shared_ptr<ms::Session> const& provider) {
+                if (provider->process_id() == pid)
+                    found = true;
+            });
+        if (found)
+            return true;
+    }
+    return false;
+}
+
 bool Application::visible() const
 {
     return m_visible;
@@ -163,13 +237,35 @@
     m_pid = pid;
 }
 
-void Application::setSession(const std::shared_ptr<mir::scene::Session>& session)
+void Application::setSession(const std::shared_ptr<ms::Session>& session)
 {
     DLOG("Application::setSession (this=%p, session=%p)", this, session.get());
 
     // TODO(greyback) what if called with new surface?
     m_session = session;
     m_visible = true; // bit of an assumption that, but no other way to deduce an actual Surface has been created
+    checkSessionChanges();
+}
+
+void Application::appendPromptSession(const std::shared_ptr<ms::PromptSession>& promptSession)
+{
+    DLOG("Application::setPromptSession (this=%p, promptSession=%p)", this, promptSession ? promptSession.get() : nullptr);
+
+    m_promptSessions.append(promptSession);
+    checkSessionChanges();
+}
+
+void Application::removePromptSession(const std::shared_ptr<ms::PromptSession>& promptSession)
+{
+    DLOG("Application::setPromptSession (this=%p, promptSession=%p)", this, promptSession ? promptSession.get() : nullptr);
+
+    QMutableListIterator<std::shared_ptr<ms::PromptSession>> iter(m_promptSessions);
+    while(iter.hasNext()) {
+        if (iter.next() == promptSession) {
+            iter.remove();
+            checkSessionChanges();
+        }
+    }
 }
 
 void Application::setSessionName(const QString& name)
@@ -198,9 +294,17 @@
 
 void Application::updateScreenshot()
 {
-    session()->take_snapshot(
-        [&](mir::scene::Snapshot const& snapshot)
+    if (!foregroundSession())
+        return;
+    std::weak_ptr<Guard> wk(m_screenShotGuard);
+
+    foregroundSession()->take_snapshot(
+        [&, wk](mir::scene::Snapshot const& snapshot)
         {
+            std::lock_guard<std::mutex> lk(screenshotMutex);
+            if (!wk.lock())
+                return;
+
             DLOG("ApplicationScreenshotProvider - Mir snapshot ready with size %d x %d",
                  snapshot.size.height.as_int(), snapshot.size.width.as_int());
 
@@ -222,7 +326,8 @@
         {
         case Application::Suspended:
             if (m_state == Application::Running) {
-                session()->set_lifecycle_state(mir_lifecycle_state_will_suspend);
+                if (session())
+                    session()->set_lifecycle_state(mir_lifecycle_state_will_suspend);
                 m_suspendTimer->start(3000);
             }
             break;
@@ -232,7 +337,8 @@
 
             if (m_state == Application::Suspended) {
                 resume();
-                session()->set_lifecycle_state(mir_lifecycle_state_resumed);
+                if (session())
+                    session()->set_lifecycle_state(mir_lifecycle_state_resumed);
             } else if (m_state == Application::Stopped) {
                 respawn();
                 state = Application::Starting;
@@ -272,7 +378,7 @@
 {
     DLOG("Application::setVisible (this=%p, visible=%s)", this, visible ? "yes" : "no");
     // FIXME: this is bad, as should a MirSurface of this app exist, it won't be notified of the visiblity change.
-    if (visible != m_visible) {
+    if (m_session && visible != m_visible) {
         if (visible) {
             m_session->show();
         } else {
@@ -306,4 +412,14 @@
     return m_longAppId;
 }
 
+void Application::checkSessionChanges()
+{
+    ms::Session* lastTopSession = m_lastForegroundSession;
+    ms::Session* currentTopSession = foregroundSession().get();
+    m_lastForegroundSession = currentTopSession;
+    if (currentTopSession && currentTopSession != lastTopSession) {
+        Q_EMIT foregroundSessionChanged();
+    }
+}
+
 } // namespace unitymir

=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2014-05-16 15:40:00 +0000
+++ src/modules/Unity/Application/application.h	2014-07-10 11:50:19 +0000
@@ -29,7 +29,13 @@
 #include <unity/shell/application/ApplicationInfoInterface.h>
 
 class QImage;
-namespace mir { namespace scene { class Session; }}
+namespace mir {
+    namespace scene {
+        class Session;
+        class PromptSession;
+        class PromptSessionManager;
+    }
+}
 
 namespace unitymir
 {
@@ -50,6 +56,7 @@
                 DesktopFileReader *desktopFileReader,
                 State state,
                 const QStringList &arguments,
+                const std::shared_ptr<mir::scene::PromptSessionManager>& promptSessionManager,
                 QObject *parent = 0);
     virtual ~Application();
 
@@ -69,7 +76,6 @@
     void setVisible(const bool);
 
     QImage screenshotImage() const;
-    void updateScreenshot();
 
     bool canBeResumed() const;
     void setCanBeResumed(const bool);
@@ -78,17 +84,26 @@
     QString desktopFile() const;
     QString exec() const;
     bool fullscreen() const;
-    std::shared_ptr<::mir::scene::Session> session() const;
     pid_t pid() const;
 
+    std::shared_ptr<mir::scene::Session> session() const;
+    std::shared_ptr<mir::scene::Session> foregroundSession() const;
+    std::shared_ptr<mir::scene::PromptSession> activePromptSession() const;
+
+    bool containsProcess(pid_t pid) const;
+
+    void checkSessionChanges();
+
 public Q_SLOTS:
     void suspend();
     void resume();
     void respawn();
+    void updateScreenshot();
 
 Q_SIGNALS:
     void fullscreenChanged();
     void stageChanged(Stage stage);
+    void foregroundSessionChanged();
     void visibleChanged();
 
 private:
@@ -97,9 +112,12 @@
     void setState(State state);
     void setFocused(bool focus);
     void setFullscreen(bool fullscreen);
-    void setSession(const std::shared_ptr<::mir::scene::Session>& session);
     void setSessionName(const QString& name);
 
+    void setSession(const std::shared_ptr<mir::scene::Session>& session);
+    void appendPromptSession(const std::shared_ptr<mir::scene::PromptSession>& session);
+    void removePromptSession(const std::shared_ptr<mir::scene::PromptSession>& session);
+
     QSharedPointer<TaskController> m_taskController;
     DesktopFileReader* m_desktopData;
     QString m_longAppId;
@@ -111,11 +129,17 @@
     QImage m_screenshotImage;
     bool m_canBeResumed;
     bool m_fullscreen;
+    std::shared_ptr<mir::scene::Session> m_session;
+    QList<std::shared_ptr<mir::scene::PromptSession>> m_promptSessions;
     bool m_visible; // duplicating internal Mir data :(
-    std::shared_ptr<::mir::scene::Session> m_session;
     QString m_sessionName;
     QStringList m_arguments;
     QTimer* m_suspendTimer;
+    mutable mir::scene::Session* m_lastForegroundSession;
+    std::shared_ptr<mir::scene::PromptSessionManager> const m_promptSessionManager;
+
+    class Guard {};
+    std::shared_ptr<Guard> m_screenShotGuard;
 
     friend class ApplicationManager;
     friend class MirSurfaceManager;

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-06-25 15:30:50 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-07-10 11:50:19 +0000
@@ -31,18 +31,23 @@
 #include "initialsurfaceplacementstrategy.h"
 #include "taskcontroller.h"
 #include "logging.h"
+#include "promptsessionlistener.h"
 
 // mir
 #include <mir/scene/depth_id.h>
 #include <mir/scene/session.h>
 #include <mir/shell/focus_controller.h>
 #include <mir/scene/surface.h>
+#include <mir/scene/prompt_session.h>
 #include <mir/graphics/display.h>
 #include <mir/graphics/display_buffer.h>
 #include <mircommon/mir/geometry/rectangles.h>
+#include <mir/frontend/shell.h>
+#include <mir/scene/prompt_session_manager.h>
 
 // Qt
 #include <QCoreApplication>
+#include <QThread>
 
 // std
 #include <csignal>
@@ -102,6 +107,20 @@
                      manager, &ApplicationManager::onSessionCreatedSurface);
 }
 
+void connectToPromptSessionListener(ApplicationManager * manager, PromptSessionListener * listener)
+{
+    QObject::connect(listener, &PromptSessionListener::promptSessionStarting,
+                     manager, &ApplicationManager::onPromptSessionStarting);
+    QObject::connect(listener, &PromptSessionListener::promptSessionStopping,
+                     manager, &ApplicationManager::onPromptSessionStopping);
+
+    QObject::connect(listener, &PromptSessionListener::promptProviderAdded,
+                     manager, &ApplicationManager::onPromptProviderAdded);
+    QObject::connect(listener, &PromptSessionListener::promptProviderRemoved,
+                     manager, &ApplicationManager::onPromptProviderRemoved);
+
+}
+
 void connectToSessionAuthorizer(ApplicationManager * manager, SessionAuthorizer * authorizer)
 {
     QObject::connect(authorizer, &SessionAuthorizer::requestAuthorizationForSession,
@@ -151,17 +170,19 @@
     // FIXME: We should use a QSharedPointer to wrap this ApplicationManager object, which requires us
     // to use the data() method to pass the raw pointer to the QML engine. However the QML engine appears
     // to take ownership of the object, and deletes it when it wants to. This conflicts with the purpose
-    // of the QSharedPointer, and a double-delete results. Trying QQmlEngine::setObjectOwnership on the 
+    // of the QSharedPointer, and a double-delete results. Trying QQmlEngine::setObjectOwnership on the
     // object no effect, which it should. Need to investigate why.
     ApplicationManager* appManager = new ApplicationManager(
                                              taskController,
                                              fileReaderFactory,
                                              procInfo,
                                              mirServer->the_focus_controller(),
+                                             mirServer->the_prompt_session_manager(),
                                              displaySize
                                          );
 
     connectToSessionListener(appManager, mirServer->sessionListener());
+    connectToPromptSessionListener(appManager, mirServer->promptSessionListener());
     connectToSessionAuthorizer(appManager, mirServer->sessionAuthorizer());
     connectToPlacementStrategy(appManager, mirServer->placementStrategy());
     connectToTaskController(appManager, taskController.data());
@@ -183,7 +204,8 @@
         const QSharedPointer<TaskController>& taskController,
         const QSharedPointer<DesktopFileReader::Factory>& desktopFileReaderFactory,
         const QSharedPointer<ProcInfo>& procInfo,
-        const std::shared_ptr<mir::shell::FocusController>& controller,
+        const std::shared_ptr<mir::shell::FocusController>& focusController,
+        const std::shared_ptr<mir::scene::PromptSessionManager>& promptSessionManager,
         const QSize& displaySize,
         QObject *parent)
     : ApplicationManagerInterface(parent)
@@ -193,13 +215,13 @@
     , m_msApplicationToBeFocused(nullptr)
     , m_ssApplicationToBeFocused(nullptr)
     , m_lifecycleExceptions(QStringList() << "com.ubuntu.music")
-    , m_focusController(controller)
+    , m_focusController(focusController)
+    , m_promptSessionManager(promptSessionManager)
     , m_dbusWindowStack(new DBusWindowStack(this))
     , m_taskController(taskController)
     , m_desktopFileReaderFactory(desktopFileReaderFactory)
     , m_procInfo(procInfo)
     , m_gridUnitPx(8)
-    , m_fenceNext(false)
     , m_displaySize(displaySize)
     , m_panelHeight(54)
 {
@@ -385,15 +407,15 @@
         DLOG("No such running application '%s'", qPrintable(appId));
         return false;
     }
-   
+
     if (application->stage() == Application::MainStage && m_sideStageApplication)
         suspendApplication(m_sideStageApplication);
-    
+
     if (application->stage() == Application::MainStage)
         m_msApplicationToBeFocused = application;
     else
         m_ssApplicationToBeFocused = application;
-    
+
     if (application->state() == Application::Stopped) {
         // Respawning this app, move to end of application list so onSessionStarting works ok
         // FIXME: this happens pretty late, shell could request respawn earlier
@@ -401,8 +423,9 @@
         int from = m_applications.indexOf(application);
         move(from, m_applications.length()-1);
     } else {
-        if (application->session()) {
-            m_focusController->set_focus_to(application->session());
+        auto mirSession = application->foregroundSession();
+        if (mirSession) {
+            m_focusController->set_focus_to(mirSession);
             int from = m_applications.indexOf(application);
             move(from, 0);
         }
@@ -474,6 +497,7 @@
                 m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId)),
                 Application::Starting,
                 arguments,
+                m_promptSessionManager,
                 this);
     if (!application->isValid()) {
         DLOG("Unable to instantiate application with appId '%s'", qPrintable(appId));
@@ -499,7 +523,9 @@
                     m_taskController,
                     m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId)),
                     Application::Starting,
-                    QStringList(), this);
+                    QStringList(),
+                    m_promptSessionManager,
+                    this);
         if (!application->isValid()) {
             DLOG("Unable to instantiate application with appId '%s'", qPrintable(appId));
             return;
@@ -703,14 +729,25 @@
 
     if (info->startsWith("maliit-server") || info->contains("qt5/libexec/QtWebProcess")) {
         authorized = true;
-        m_fenceNext = true;
+        m_hiddenPIDs << pid;
+        return;
+    }
+
+    const quint64 ppid = m_procInfo->parentProcess(pid);
+    if (info->contains("trust-session-demo-trusted-helper") ||
+        info->contains("unity8") ||
+        (ppid != 0 && m_procInfo->commandLine(ppid)->contains("trust-session-demo-trusted-helper"))) {
+        DLOG("ApplicationManager ACCEPTED trust app %lld", pid);
+        authorized = true;
+        m_hiddenPIDs << pid;
         return;
     }
 
     boost::optional<QString> desktopFileName{ info->getParameter("--desktop_file_hint=") };
 
     if (!desktopFileName) {
-        LOG("ApplicationManager REJECTED connection from app with pid %lld as no desktop_file_hint specified", pid);
+        LOG("ApplicationManager REJECTED connection from app with pid %lld as no desktop_file_hint specified (%s)", pid,
+            qPrintable(info->asStringList().first()));
         return;
     }
 
@@ -758,7 +795,13 @@
     DLOG("Existing process with pid %lld appeared, adding '%s' to application lists", pid, desktopData->name().toLatin1().data());
 
     QStringList arguments(info->asStringList());
-    application = new Application(m_taskController, desktopData, Application::Starting, arguments, this);
+    application = new Application(
+        m_taskController,
+        desktopData,
+        Application::Starting,
+        arguments,
+        m_promptSessionManager,
+        this);
     application->setPid(pid);
     application->setStage(stage);
     application->setCanBeResumed(false);
@@ -768,11 +811,11 @@
 
 void ApplicationManager::placeSession(ms::Session const* session, uint32_t &x, uint32_t &y)
 {
-    Application* application = findApplicationWithSession(session);
+    Application* application = findApplicationWithSession(session, true);
     DLOG("ApplicationManager::placeSession (this=%p, application=%p, session=%p, name=%s)", this, application, session,
          session?(session->name().c_str()):"null");
 
-    // Application defaults 
+    // Application defaults
     x = 0;
     y = m_panelHeight;
 
@@ -789,7 +832,7 @@
     // SideStage override
     if (application && application->stage() == Application::SideStage)
         x = m_displaySize.width() - (SIDE_STAGE_WIDTH_GU * m_gridUnitPx);
-    
+
     DLOG("ApplicationManager::placeSession (x=%d, y=%d)", x, y);
 }
 
@@ -797,12 +840,9 @@
 {
     DLOG("ApplicationManager::onSessionStarting (this=%p, application=%s)", this, session?session->name().c_str():"null");
 
-    if (m_fenceNext) {
-        m_fenceNext = false;
-        return;
-    }
+    pid_t pid = session->process_id();
 
-    Application* application = findApplicationWithPid(session->process_id());
+    Application* application = findApplicationWithPid(session->process_id(), false);
     if (application && application->state() != Application::Running) {
         application->setSession(session);
         if (application->stage() == Application::MainStage)
@@ -810,18 +850,18 @@
         else
             m_ssApplicationToBeFocused = application;
     } else {
+        if (m_hiddenPIDs.contains(pid)) {
+            return;
+        }
         DLOG("ApplicationManager::onSessionStarting - unauthorized application!!");
     }
 }
 
 void ApplicationManager::onSessionStopping(const std::shared_ptr<ms::Session>& session)
 {
-    // in case application closed not by hand of shell, check again here:
-    Application* application = findApplicationWithSession(session);
-
-    DLOG("ApplicationManager::onSessionStopping (this=%p, application=%p, appId=%s, session name=%s)", this, application,
-         application?qPrintable(application->appId()):"null", session?session->name().c_str():"null");
-
+    DLOG("ApplicationManager::onSessionStopping (this=%p, session name=%s)", this, session?session->name().c_str():"null");
+
+    Application* application = findApplicationWithSession(session, false); // only check app sessions
     if (application) {
         /* Can remove the application from the running apps list immediately in these curcumstances:
          *  1. application is not managed by upstart (this message from Mir is only notice the app has stopped, must do
@@ -844,17 +884,19 @@
             application->setState(Application::Stopped);
         }
     }
+
+    m_hiddenPIDs.removeOne(session->process_id());
 }
 
 void ApplicationManager::onSessionFocused(const std::shared_ptr<ms::Session>& session)
 {
-    Application* application = findApplicationWithSession(session);
+    Application* application = findApplicationWithSession(session, true);
     DLOG("ApplicationManager::onSessionFocused (this=%p, application=%p, appId=%s, session name=%s)", this, application,
          application?qPrintable(application->appId()):"null", session?session->name().c_str():"null");
 
     // Don't give application focus until it has created it's surface, when it is set as state "Running"
     // and only notify shell of focus changes that it actually expects
-    if (application && application->state() != Application::Starting && 
+    if (application && application->state() != Application::Starting &&
         (application == m_msApplicationToBeFocused ||
          application == m_ssApplicationToBeFocused)
             && application != m_focusedApplication) {
@@ -864,10 +906,14 @@
     } else {
         if (application == nullptr) {
             DLOG("Invalid application focused, discarding the event");
-            if (nullptr != m_focusedApplication)
+            if (nullptr != m_focusedApplication) {
                 focusApplication(m_focusedApplication->appId());
-            else
+            } else {
                 m_focusController->set_focus_to(nullptr);
+            }
+        } else if (application == m_focusedApplication && session != application->foregroundSession()) {
+            DLOG("Focused session is not on top. Resetting focus");
+            focusApplication(application->appId());
         }
     }
 }
@@ -878,7 +924,8 @@
     if (nullptr != m_focusedApplication) {
         Q_ASSERT(m_focusedApplication->focused());
         m_focusedApplication->setFocused(false);
-        
+
+        auto lastFocusedApp = m_focusedApplication;
         suspendApplication(m_focusedApplication);
 
         m_focusedApplication = nullptr;
@@ -887,22 +934,87 @@
 
         QModelIndex appIndex = findIndex(m_focusedApplication);
         Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleFocused << RoleState);
+
+        if (lastFocusedApp && lastFocusedApp->activePromptSession()) {
+            m_promptSessionManager->stop_prompt_session(lastFocusedApp->activePromptSession());
+        }
     }
 }
 
 void ApplicationManager::onSessionCreatedSurface(const ms::Session * session,
                                                  const std::shared_ptr<ms::Surface> & surface)
 {
-    DLOG("ApplicationManager::onSessionCreatedSurface (this=%p)", this);
+    DLOG("ApplicationManager::onSessionCreatedSurface (this=%p, appId=%s)", this, session->name().c_str());
     Q_UNUSED(surface);
 
-    Application* application = findApplicationWithSession(session);
-    if (application && application->state() == Application::Starting) {
-        m_dbusWindowStack->WindowCreated(0, application->appId());
-        // only when Session creates a Surface will we actually mark it focused
-        setFocused(application);
-        QModelIndex appIndex = findIndex(application);
-        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleFocused);
+    Application* application = findApplicationWithSession(session, true);
+    if (application) {
+        if (application->state() == Application::Starting) {
+            m_dbusWindowStack->WindowCreated(0, application->appId());
+            // only when Session creates a Surface will we actually mark it focused
+            setFocused(application);
+            QModelIndex appIndex = findIndex(application);
+            Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleFocused);
+        }
+
+        application->checkSessionChanges();
+    }
+}
+
+void ApplicationManager::onPromptSessionStarting(const std::shared_ptr<ms::PromptSession>& promptSession)
+{
+    DLOG("ApplicationManager::onPromptSessionStarting (this=%p, prompt_session=%p)", this, promptSession.get());
+
+    Application* app = findApplicationWithSession(m_promptSessionManager->application_for(promptSession), false);
+    if (app) {
+        app->appendPromptSession(promptSession);
+    } else {
+        DLOG("ApplicationManager::onPromptSessionStarting - no app found (prompt_session=%p)", promptSession.get());
+    }
+}
+
+void ApplicationManager::onPromptSessionStopping(const std::shared_ptr<ms::PromptSession>& promptSession)
+{
+    DLOG("ApplicationManager::onPromptSessionStopping (this=%p, prompt_session=%p)", this, promptSession.get());
+
+    for (Application *app : m_applications) {
+        app->removePromptSession(promptSession);
+    }
+}
+
+void ApplicationManager::onPromptProviderAdded(ms::PromptSession const* promptSession,
+                                               const std::shared_ptr<ms::Session>& session)
+{
+    Q_UNUSED(promptSession);
+    DLOG("ApplicationManager::onPromptProviderAdded (this=%p, prompt_session=%p, session=%s)", this, promptSession, session?session->name().c_str():"null");
+
+    Application* app = findApplicationWithSession(session, true);
+    if (app) {
+        app->checkSessionChanges();
+
+        if (app == m_focusedApplication) {
+            focusApplication(app->appId());
+        }
+    } else {
+        DLOG("ApplicationManager::onPromptProviderAdded - no app found (prompt_session=%p)", promptSession);
+    }
+}
+
+void ApplicationManager::onPromptProviderRemoved(ms::PromptSession const* promptSession,
+                                                 const std::shared_ptr<ms::Session>& session)
+{
+    Q_UNUSED(session);
+    DLOG("ApplicationManager::onPromptProviderAdded (this=%p, prompt_session=%p, session=%s)", this, (void*)promptSession, session?session->name().c_str():"null");
+
+    // we need to update the focus if the app is in focus.
+    for (Application *app : m_applications) {
+        if (promptSession == app->activePromptSession().get()) {
+            app->checkSessionChanges();
+
+            if (app == m_focusedApplication) {
+                focusApplication(app->appId());
+            }
+        }
     }
 }
 
@@ -925,6 +1037,7 @@
     else
         m_sideStageApplication = application;
 
+    auto lastFocusedApp = m_focusedApplication;
     m_focusedApplication = application;
     m_focusedApplication->setFocused(true);
     m_focusedApplication->setVisible(true);
@@ -932,24 +1045,26 @@
     move(m_applications.indexOf(application), 0);
     Q_EMIT focusedApplicationIdChanged();
     m_dbusWindowStack->FocusedWindowChanged(0, application->appId(), application->stage());
-}
-
-Application* ApplicationManager::findApplicationWithSession(const std::shared_ptr<ms::Session> &session)
-{
-    return findApplicationWithSession(session.get());
-}
-
-Application* ApplicationManager::findApplicationWithSession(const ms::Session *session)
-{
-    for (Application *app : m_applications) {
-        if (app->session().get() == session) {
-            return app;
-        }
+
+    // stop prompt session when focus changes.
+    if (lastFocusedApp && lastFocusedApp->activePromptSession()) {
+        m_promptSessionManager->stop_prompt_session(lastFocusedApp->activePromptSession());
     }
-    return nullptr;
-}
-
-Application* ApplicationManager::findApplicationWithPid(const qint64 pid)
+}
+
+Application* ApplicationManager::findApplicationWithSession(const std::shared_ptr<ms::Session> &session, bool includeChildSessions)
+{
+    return findApplicationWithSession(session.get(), includeChildSessions);
+}
+
+Application* ApplicationManager::findApplicationWithSession(const ms::Session *session, bool includeChildSessions)
+{
+    if (!session)
+        return nullptr;
+    return findApplicationWithPid(session->process_id(), includeChildSessions);
+}
+
+Application* ApplicationManager::findApplicationWithPid(const qint64 pid, bool includeChildSessions)
 {
     if (pid <= 0)
         return nullptr;
@@ -958,6 +1073,10 @@
         if (app->m_pid == pid) {
             return app;
         }
+
+        if (includeChildSessions && app->containsProcess(pid)) {
+            return app;
+        }
     }
     return nullptr;
 }
@@ -1006,7 +1125,8 @@
     }
 }
 
-void ApplicationManager::move(int from, int to) {
+void ApplicationManager::move(int from, int to)
+{
     DLOG("ApplicationManager::move (this=%p, from=%d, to=%d)", this, from, to);
     if (from == to) return;
 
@@ -1036,8 +1156,15 @@
 {
     if (application == m_focusedApplication) {
         // TODO(greyback) What to do?? Focus next app, or unfocus everything??
+        auto lastFocusedApp = m_focusedApplication;
         m_focusedApplication = nullptr;
         Q_EMIT focusedApplicationIdChanged();
+
+        // stop prompt session when focus changes.
+        if (lastFocusedApp && lastFocusedApp->activePromptSession()) {
+            m_promptSessionManager->stop_prompt_session(lastFocusedApp->activePromptSession());
+        }
+
         return true;
     }
     return false;

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2014-05-26 15:54:44 +0000
+++ src/modules/Unity/Application/application_manager.h	2014-07-10 11:50:19 +0000
@@ -41,6 +41,8 @@
     namespace scene {
         class Session;
         class Surface;
+        class PromptSession;
+        class PromptSessionManager;
     }
     namespace shell {
         class FocusController;
@@ -79,8 +81,9 @@
     explicit ApplicationManager(const QSharedPointer<TaskController>& taskController,
                                 const QSharedPointer<DesktopFileReader::Factory>& desktopFileReaderFactory,
                                 const QSharedPointer<ProcInfo>& processInfo,
-                                std::shared_ptr<mir::shell::FocusController> const& controller,
-                                QSize const& displaySize,
+                                const std::shared_ptr<mir::shell::FocusController>& focusController,
+                                const std::shared_ptr<mir::scene::PromptSessionManager>& promptSessionManager,
+                                const QSize& displaySize,
                                 QObject *parent = 0);
     virtual ~ApplicationManager();
 
@@ -106,7 +109,7 @@
     Q_INVOKABLE void move(int from, int to);
 
     const QList<Application*> &list() const { return m_applications; }
-    unitymir::Application* findApplicationWithPid(const qint64 pid);
+    Application* findApplicationWithPid(const qint64 pid, bool includeChildSessions);
 
     // Internal helpers
     bool suspendApplication(Application *application);
@@ -117,13 +120,18 @@
 public Q_SLOTS:
     void authorizeSession(const quint64 pid, bool &authorized);
     void placeSession(::mir::scene::Session const*, uint32_t &x, uint32_t &y);
-    
-    void onSessionStarting(std::shared_ptr<::mir::scene::Session> const& session);
-    void onSessionStopping(std::shared_ptr<::mir::scene::Session> const& session);
-    void onSessionFocused(std::shared_ptr<::mir::scene::Session> const& session);
+
+    void onSessionStarting(const std::shared_ptr<::mir::scene::Session>& session);
+    void onSessionStopping(const std::shared_ptr<::mir::scene::Session>& session);
+    void onSessionFocused(const std::shared_ptr<::mir::scene::Session>& session);
     void onSessionUnfocused();
 
-    void onSessionCreatedSurface(::mir::scene::Session const*, std::shared_ptr<::mir::scene::Surface> const&);
+    void onPromptSessionStarting(const std::shared_ptr<mir::scene::PromptSession>& promptSession);
+    void onPromptSessionStopping(const std::shared_ptr<mir::scene::PromptSession>& promptSession);
+    void onPromptProviderAdded(mir::scene::PromptSession const* promptSession, const std::shared_ptr<mir::scene::Session>& session);
+    void onPromptProviderRemoved(mir::scene::PromptSession const* promptSession, const std::shared_ptr<mir::scene::Session>& session);
+
+    void onSessionCreatedSurface(::mir::scene::Session const*, const std::shared_ptr<::mir::scene::Surface>&);
 
     void onProcessFailed(const QString& appId, const bool duringStartup);
     void onProcessStarting(const QString& appId);
@@ -141,8 +149,8 @@
     void setFocused(Application *application);
     void add(Application *application);
     void remove(Application* application);
-    Application* findApplicationWithSession(const std::shared_ptr<::mir::scene::Session> &session);
-    Application* findApplicationWithSession(const ::mir::scene::Session *session);
+    Application* findApplicationWithSession(const std::shared_ptr<mir::scene::Session> &session, bool includeChildSessions);
+    Application* findApplicationWithSession(const mir::scene::Session *session, bool includeChildSessions);
     Application* applicationForStage(Application::Stage stage);
     QModelIndex findIndex(Application* application);
     bool isFocused(Application* application);
@@ -155,13 +163,14 @@
     Application* m_msApplicationToBeFocused; // placeholder store for async focusing
     Application* m_ssApplicationToBeFocused; // placeholder store for async focusing
     QStringList m_lifecycleExceptions;
-    std::shared_ptr<mir::shell::FocusController> m_focusController;
+    std::shared_ptr<mir::shell::FocusController> const m_focusController;
+    std::shared_ptr<mir::scene::PromptSessionManager> const m_promptSessionManager;
     DBusWindowStack* m_dbusWindowStack;
     QSharedPointer<TaskController> m_taskController;
     QSharedPointer<DesktopFileReader::Factory> m_desktopFileReaderFactory;
     QSharedPointer<ProcInfo> m_procInfo;
     int m_gridUnitPx;
-    bool m_fenceNext;
+    QList<pid_t> m_hiddenPIDs;
     QString m_nextFocusedAppId;
     QSize m_displaySize;
     int m_panelHeight;

=== modified file 'src/modules/Unity/Application/applicationscreenshotprovider.cpp'
--- src/modules/Unity/Application/applicationscreenshotprovider.cpp	2014-04-15 14:31:02 +0000
+++ src/modules/Unity/Application/applicationscreenshotprovider.cpp	2014-07-10 11:50:19 +0000
@@ -52,7 +52,8 @@
 
     // TODO: if app not ready, return an app-provided splash image. If app has been stopped with saved state
     // return the screenshot that was saved to disk.
-    if (!app->session() || !app->session()->default_surface()) {
+    auto mirSession = app->foregroundSession();
+    if (!mirSession || !mirSession->default_surface()) {
         LOG("ApplicationScreenshotProvider - app session not found - asking for screenshot too early");
         return QImage();
     }

=== modified file 'src/modules/Unity/Application/dbuswindowstack.cpp'
--- src/modules/Unity/Application/dbuswindowstack.cpp	2014-03-11 03:40:49 +0000
+++ src/modules/Unity/Application/dbuswindowstack.cpp	2014-07-10 11:50:19 +0000
@@ -47,7 +47,7 @@
 {
     AppIdDesktopFile res;
     ApplicationManager *appMgr = static_cast<ApplicationManager*>(parent());
-    const Application* app = static_cast<Application*>(appMgr->findApplicationWithPid(pid));
+    const Application* app = static_cast<Application*>(appMgr->findApplicationWithPid(pid, false));
     if (app) {
         res.app_id = app->appId();
         res.desktop_file = app->desktopFile();

=== modified file 'src/modules/Unity/Application/inputarea.cpp'
--- src/modules/Unity/Application/inputarea.cpp	2014-06-27 08:36:07 +0000
+++ src/modules/Unity/Application/inputarea.cpp	2014-07-10 11:50:19 +0000
@@ -178,11 +178,12 @@
 {
     DLOG("InputArea::setMirInputArea (this=%p, x=%lf, y=%lf, width=%lf, height=%lf)", this, relativeGeometry.x(), relativeGeometry.y(), relativeGeometry.width(), relativeGeometry.height());
     using namespace mir::geometry;
+    const QRect rect = parentItem()->mapRectToScene(relativeGeometry).toRect();
 
-    m_mirInputArea.top_left.x = X{relativeGeometry.x()};
-    m_mirInputArea.top_left.y = Y{relativeGeometry.y()};
-    m_mirInputArea.size.width = Width{relativeGeometry.width()};
-    m_mirInputArea.size.height = Height{relativeGeometry.height()};
+    m_mirInputArea.top_left.x = X{rect.x()};
+    m_mirInputArea.top_left.y = Y{rect.y()};
+    m_mirInputArea.size.width = Width{rect.width()};
+    m_mirInputArea.size.height = Height{rect.height()};
 
     if (m_surface) {
         m_surface->installInputArea(this);

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2014-04-15 14:31:02 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2014-07-10 11:50:19 +0000
@@ -106,8 +106,8 @@
 {
     DLOG("MirSurfaceManager::sessionCreatedSurface (this=%p) with surface name '%s'", this, surface->name().c_str());
     ApplicationManager* appMgr = static_cast<ApplicationManager*>(ApplicationManager::singleton());
-    Application* application = appMgr->findApplicationWithSession(session);
-    
+    Application* application = appMgr->findApplicationWithSession(session, false);
+
     auto qmlSurface = new MirSurface(surface, application);
     m_surfaces.insert(surface.get(), qmlSurface);
     Q_EMIT surfaceCreated(qmlSurface);
@@ -137,7 +137,7 @@
     if (fs) {
         fs->set_default_keyboard_target(surface);
     }
-    
+
     Q_EMIT shellSurfaceChanged(m_shellSurface);
 }
 

=== modified file 'src/modules/Unity/Application/proc_info.cpp'
--- src/modules/Unity/Application/proc_info.cpp	2014-03-11 19:11:00 +0000
+++ src/modules/Unity/Application/proc_info.cpp	2014-07-10 11:50:19 +0000
@@ -19,6 +19,9 @@
 #include <QFile>
 #include <QRegularExpression>
 
+#include <core/posix/process.h>
+#include <core/posix/linux/proc/process/stat.h>
+
 namespace unitymir
 {
 
@@ -33,6 +36,16 @@
 
     return std::unique_ptr<CommandLine>(new CommandLine{ cmdline.readLine().replace('\0', ' ') });
 }
+
+quint64 ProcInfo::parentProcess(quint64 pid)
+{
+    core::posix::Process process(pid);
+    core::posix::linux::proc::process::Stat stat;
+    process >> stat;
+
+    return stat.parent;
+}
+
 QStringList ProcInfo::CommandLine::asStringList() const {
     return QString(m_command.data()).split(' ');
 }

=== modified file 'src/modules/Unity/Application/proc_info.h'
--- src/modules/Unity/Application/proc_info.h	2014-03-11 19:11:00 +0000
+++ src/modules/Unity/Application/proc_info.h	2014-07-10 11:50:19 +0000
@@ -45,6 +45,9 @@
         QStringList asStringList() const;
     };
     virtual std::unique_ptr<CommandLine> commandLine(quint64 pid);
+
+    virtual quint64 parentProcess(quint64 pid);
+
     virtual ~ProcInfo();
 };
 

=== modified file 'src/unity-mir/CMakeLists.txt'
--- src/unity-mir/CMakeLists.txt	2014-05-22 21:37:02 +0000
+++ src/unity-mir/CMakeLists.txt	2014-07-10 11:50:19 +0000
@@ -28,6 +28,7 @@
   logging.h
   focussetter.h
   serverstatuslistener.h
+  promptsessionlistener.h
   ${GENERATED_PROTOBUF_HDRS}
 )
 
@@ -47,6 +48,7 @@
   unityprotobufservice.cpp
   focussetter.cpp
   serverstatuslistener.cpp
+  promptsessionlistener.cpp
 
   ${UNITY_MIR_HEADERS}
   ${GENERATED_PROTOBUF_SRCS}

=== modified file 'src/unity-mir/focussetter.cpp'
--- src/unity-mir/focussetter.cpp	2014-04-15 14:31:02 +0000
+++ src/unity-mir/focussetter.cpp	2014-07-10 11:50:19 +0000
@@ -15,6 +15,7 @@
  */
 
 #include <mir/scene/surface.h>
+#include <mir/scene/session.h>
 
 #include "focussetter.h"
 #include "logging.h"
@@ -35,7 +36,7 @@
 
 void FocusSetter::set_focus_to(std::shared_ptr<ms::Session> const& session)
 {
-    DLOG("FocusSetter::set_focus_to(session=%p):%d", session.get(), __LINE__);
+    DLOG("FocusSetter::set_focus_to(session=%p, session name=%s):%d", session.get(), session?session->name().c_str():"null", __LINE__);
     // Ensure we always call the underlying setter to dispatch focus/unfocus notifications.
     underlying_setter->set_focus_to(session);
     if (session == nullptr)
@@ -53,6 +54,6 @@
     assert(t);
 
     default_keyboard_target = default_target;
-    
+
     t->take_input_focus(keyboard_input_targeter);
 }

=== added file 'src/unity-mir/promptsessionlistener.cpp'
--- src/unity-mir/promptsessionlistener.cpp	1970-01-01 00:00:00 +0000
+++ src/unity-mir/promptsessionlistener.cpp	2014-07-10 11:50:19 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "promptsessionlistener.h"
+#include "logging.h"
+
+namespace ms = mir::scene;
+
+Q_DECLARE_METATYPE(std::shared_ptr<ms::PromptSession>)
+
+PromptSessionListener::PromptSessionListener(QObject *parent) :
+    QObject(parent)
+{
+    DLOG("PromptSessionListener::PromptSessionListener (this=%p)", this);
+    qRegisterMetaType<std::shared_ptr<ms::PromptSession>>("std::shared_ptr<mir::scene::PromptSession>");
+}
+
+PromptSessionListener::~PromptSessionListener()
+{
+    DLOG("PromptSessionListener::~PromptSessionListener (this=%p)", this);
+}
+
+void PromptSessionListener::starting(std::shared_ptr<ms::PromptSession> const& prompt_session)
+{
+    DLOG("PromptSessionListener::starting (this=%p, prompt_session=%p)", this, (void*)prompt_session.get());
+    Q_EMIT promptSessionStarting(prompt_session);
+}
+
+void PromptSessionListener::stopping(std::shared_ptr<ms::PromptSession> const& prompt_session)
+{
+    DLOG("PromptSessionListener::stopping (this=%p, prompt_session=%p)", this, (void*)prompt_session.get());
+    Q_EMIT promptSessionStopping(prompt_session);
+}
+
+void PromptSessionListener::prompt_provider_added(ms::PromptSession const& prompt_session,
+                                                  std::shared_ptr<ms::Session> const& prompt_provider)
+{
+    DLOG("PromptSessionListener::prompt_provider_added (this=%p, prompt_session=%p, prompt_provider=%p)",
+        this, &prompt_session, (void*)prompt_provider.get());
+    Q_EMIT promptProviderAdded(&prompt_session, prompt_provider);
+}
+
+void PromptSessionListener::prompt_provider_removed(ms::PromptSession const& prompt_session,
+                                                    std::shared_ptr<ms::Session> const& prompt_provider)
+{
+    DLOG("PromptSessionListener::prompt_provider_removed (this=%p, prompt_session=%p, prompt_provider=%p)",
+        this, &prompt_session, (void*)prompt_provider.get());
+    Q_EMIT promptProviderRemoved(&prompt_session, prompt_provider);
+}

=== added file 'src/unity-mir/promptsessionlistener.h'
--- src/unity-mir/promptsessionlistener.h	1970-01-01 00:00:00 +0000
+++ src/unity-mir/promptsessionlistener.h	2014-07-10 11:50:19 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PROMPTSESSIONLISTENER_H
+#define PROMPTSESSIONLISTENER_H
+
+#include <QObject>
+
+#include "mir/scene/prompt_session_listener.h"
+
+class PromptSessionListener : public QObject, public mir::scene::PromptSessionListener
+{
+    Q_OBJECT
+public:
+    explicit PromptSessionListener(QObject *parent = 0);
+    ~PromptSessionListener();
+
+    void starting(std::shared_ptr<mir::scene::PromptSession> const& prompt_session) override;
+    void stopping(std::shared_ptr<mir::scene::PromptSession> const& prompt_session) override;
+
+    void prompt_provider_added(mir::scene::PromptSession const& prompt_session,
+        std::shared_ptr<mir::scene::Session> const& prompt_provider) override;
+    void prompt_provider_removed(mir::scene::PromptSession const& prompt_session,
+        std::shared_ptr<mir::scene::Session> const& prompt_provider) override;
+
+Q_SIGNALS:
+    void promptSessionStarting(std::shared_ptr<mir::scene::PromptSession> const& session);
+    void promptSessionStopping(std::shared_ptr<mir::scene::PromptSession> const& session);
+
+    void promptProviderAdded(mir::scene::PromptSession const*, std::shared_ptr<mir::scene::Session> const&);
+    void promptProviderRemoved(mir::scene::PromptSession const*, std::shared_ptr<mir::scene::Session> const&);
+};
+
+#endif // SESSIONLISTENER_H

=== modified file 'src/unity-mir/shellserverconfiguration.cpp'
--- src/unity-mir/shellserverconfiguration.cpp	2014-05-08 03:50:31 +0000
+++ src/unity-mir/shellserverconfiguration.cpp	2014-07-10 11:50:19 +0000
@@ -24,6 +24,7 @@
 #include "sessionlistener.h"
 #include "surfaceconfigurator.h"
 #include "sessionauthorizer.h"
+#include "promptsessionlistener.h"
 #include "focussetter.h"
 #include "logging.h"
 
@@ -117,6 +118,16 @@
        });
 }
 
+std::shared_ptr<ms::PromptSessionListener>
+ShellServerConfiguration::the_prompt_session_listener()
+{
+    return prompt_session_listener(
+        [this]
+        {
+            return std::make_shared<PromptSessionListener>();
+        });
+}
+
 std::shared_ptr<mir::ServerStatusListener>
 ShellServerConfiguration::the_server_status_listener()
 {
@@ -136,7 +147,7 @@
 // The rationale is that if when you do
 //     the_session_authorizer()
 // get a pointer that is unique means that Mir is not
-// holding the pointer and thus when we return from the 
+// holding the pointer and thus when we return from the
 //     sessionAuthorizer()
 // scope the unique pointer will be destroyed so we return 0
 //
@@ -165,6 +176,14 @@
     return static_cast<SessionListener*>(sharedPtr.get());
 }
 
+PromptSessionListener *ShellServerConfiguration::promptSessionListener()
+{
+    auto sharedPtr = the_prompt_session_listener();
+    if (sharedPtr.unique()) return 0;
+
+    return static_cast<PromptSessionListener*>(sharedPtr.get());
+}
+
 SurfaceConfigurator *ShellServerConfiguration::surfaceConfigurator()
 {
     auto sharedPtr = the_surface_configurator();

=== modified file 'src/unity-mir/shellserverconfiguration.h'
--- src/unity-mir/shellserverconfiguration.h	2014-05-08 03:50:31 +0000
+++ src/unity-mir/shellserverconfiguration.h	2014-07-10 11:50:19 +0000
@@ -28,6 +28,7 @@
 
 class FocusSetter;
 class SessionListener;
+class PromptSessionListener;
 class SessionAuthorizer;
 class SurfaceConfigurator;
 class InitialSurfacePlacementStrategy;
@@ -38,6 +39,7 @@
 
     Q_PROPERTY(SessionAuthorizer* sessionAuthorizer READ sessionAuthorizer CONSTANT)
     Q_PROPERTY(SessionListener* sessionListener READ sessionListener CONSTANT)
+    Q_PROPERTY(PromptSessionListener* promptSessionListener READ promptSessionListener CONSTANT)
     Q_PROPERTY(SurfaceConfigurator* surfaceConfigurator READ surfaceConfigurator CONSTANT)
 
 public:
@@ -50,6 +52,7 @@
     std::shared_ptr<mir::scene::SessionListener> the_session_listener() override;
     std::shared_ptr<mir::scene::SurfaceConfigurator> the_surface_configurator() override;
     std::shared_ptr<mir::shell::FocusSetter> the_shell_focus_setter() override;
+    std::shared_ptr<mir::scene::PromptSessionListener> the_prompt_session_listener() override;
     std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override;
     std::shared_ptr<mir::frontend::SessionAuthorizer> the_session_authorizer() override;
     std::shared_ptr<mir::frontend::ConnectionCreator> the_connection_creator() override;
@@ -59,6 +62,7 @@
     InitialSurfacePlacementStrategy *placementStrategy();
     SessionAuthorizer *sessionAuthorizer();
     SessionListener *sessionListener();
+    PromptSessionListener *promptSessionListener();
     SurfaceConfigurator *surfaceConfigurator();
     FocusSetter *focusSetter();
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-05-19 12:13:58 +0000
+++ tests/CMakeLists.txt	2014-07-10 11:50:19 +0000
@@ -33,6 +33,7 @@
   mock_process_controller.h
   mock_proc_info.h
   mock_session.h
+  mock_prompt_session_manager.h
 )
 
 add_executable(

=== modified file 'tests/application_manager_test.cpp'
--- tests/application_manager_test.cpp	2014-06-25 15:30:50 +0000
+++ tests/application_manager_test.cpp	2014-07-10 11:50:19 +0000
@@ -25,6 +25,8 @@
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include <thread>
+#include <condition_variable>
 #include <QSignalSpy>
 
 #include "mock_application_controller.h"
@@ -34,6 +36,8 @@
 #include "mock_proc_info.h"
 #include "mock_session.h"
 #include "mock_focus_controller.h"
+#include "mock_prompt_session_manager.h"
+#include "mock_prompt_session.h"
 
 using namespace unitymir;
 
@@ -66,16 +70,49 @@
                 [](DesktopFileReader::Factory*){}),
             QSharedPointer<ProcInfo>(&procInfo,[](ProcInfo *){}),
             std::shared_ptr<mir::shell::FocusController>(&focusController, [](void*){}),
+            std::shared_ptr<mir::scene::PromptSessionManager>(&promptSessionManager, [](void*){}),
             QSize(400,400)
         }
     {
     }
+
+    Application* startApplication(quint64 procId, QString const& appId)
+    {
+        using namespace testing;
+
+        ON_CALL(appController,appIdHasProcessId(procId, appId)).WillByDefault(Return(true));
+
+        // Set up Mocks & signal watcher
+        auto mockDesktopFileReader = new NiceMock<MockDesktopFileReader>(appId, QFileInfo());
+        ON_CALL(*mockDesktopFileReader, loaded()).WillByDefault(Return(true));
+        ON_CALL(*mockDesktopFileReader, appId()).WillByDefault(Return(appId));
+
+        ON_CALL(desktopFileReaderFactory, createInstance(appId, _)).WillByDefault(Return(mockDesktopFileReader));
+
+        EXPECT_CALL(appController, startApplicationWithAppIdAndArgs(appId, _))
+            .Times(1)
+            .WillOnce(Return(true));
+
+        auto application = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
+        applicationManager.onProcessStarting(appId);
+
+        bool authed = false;
+        applicationManager.authorizeSession(procId, authed);
+        EXPECT_EQ(authed, true);
+
+        auto appSession = std::make_shared<MockSession>(appId.toStdString(), procId);
+
+        applicationManager.onSessionStarting(appSession);
+        return application;
+    }
+
     testing::NiceMock<testing::MockOomController> oomController;
     testing::NiceMock<testing::MockProcessController> processController;
     testing::NiceMock<testing::MockApplicationController> appController;
     testing::NiceMock<testing::MockProcInfo> procInfo;
     testing::NiceMock<testing::MockDesktopFileReaderFactory> desktopFileReaderFactory;
     testing::NiceMock<testing::MockFocusController> focusController;
+    testing::NiceMock<testing::MockPromptSessionManager> promptSessionManager;
     QSharedPointer<TaskController> taskController;
     ApplicationManager applicationManager;
 };
@@ -1879,3 +1916,153 @@
     EXPECT_EQ(countSpy.count(), 0);
     EXPECT_EQ(removedSpy.count(), 0);
 }
+
+/*
+ * Test that screenshotting callback works cross thread.
+ */
+TEST_F(ApplicationManagerTests, threadedScreenshot)
+{
+    using namespace testing;
+    quint64 procId1 = 5551;
+
+    std::mutex mutex;
+    std::condition_variable cv;
+    bool done = false;
+
+    auto application = startApplication(procId1, "webapp");
+    auto session = std::dynamic_pointer_cast<MockSession>(application->session());
+    ON_CALL(*session, take_snapshot(_)).WillByDefault(Invoke(
+        [&](mir::scene::SnapshotCallback const& callback)
+        {
+            std::thread ([&, callback]() {
+                std::unique_lock<std::mutex> lk(mutex);
+
+                mir::scene::Snapshot snapshot{mir::geometry::Size{0,0},
+                                          mir::geometry::Stride{0},
+                                          NULL};
+
+                callback(snapshot);
+
+                done = true;
+                lk.unlock();
+                cv.notify_one();
+            }).detach();
+        }));
+
+    application->updateScreenshot();
+
+    {
+        std::unique_lock<decltype(mutex)> lk(mutex);
+        cv.wait(lk, [&] { return done; } );
+        EXPECT_TRUE(done);
+    }
+
+    applicationManager.stopApplication(application->appId());
+}
+
+/*
+ * Test that screenshotting callback works when application has been deleted
+ */
+TEST_F(ApplicationManagerTests, threadedScreenshotAfterAppDelete)
+{
+    using namespace testing;
+    quint64 procId1 = 5551;
+
+    std::mutex mutex;
+    std::condition_variable cv;
+    bool ready = false;
+    bool done = false;
+
+    auto application = startApplication(procId1, "webapp");
+    auto session = std::dynamic_pointer_cast<MockSession>(application->session());
+    ON_CALL(*session, take_snapshot(_)).WillByDefault(Invoke(
+        [&](mir::scene::SnapshotCallback const& callback)
+        {
+            std::thread ([&, callback]() {
+
+                std::unique_lock<std::mutex> lk(mutex);
+                cv.wait(lk, [&]{ return ready; } );
+
+                mir::scene::Snapshot snapshot{mir::geometry::Size{0,0},
+                                          mir::geometry::Stride{0},
+                                          NULL};
+
+                callback(snapshot);
+
+                done = true;
+                lk.unlock();
+                cv.notify_one();
+            }).detach();
+        }));
+    application->updateScreenshot();
+
+    {
+        std::lock_guard<decltype(mutex)> lk(mutex);
+        applicationManager.stopApplication(application->appId());
+        ready = true;
+    }
+    cv.notify_one();
+
+    {
+        std::unique_lock<decltype(mutex)> lk(mutex);
+        cv.wait(lk, [&] { return done; } );
+    }
+}
+
+TEST_F(ApplicationManagerTests, applicationTracksPromptSession)
+{
+    using namespace testing;
+    quint64 procId1 = 5551;
+
+    auto application = startApplication(procId1, "webapp");
+    auto promptSession = std::make_shared<MockPromptSession>();
+
+    ON_CALL(promptSessionManager, application_for(_)).WillByDefault(Return(application->session()));
+
+    applicationManager.onPromptSessionStarting(promptSession);
+
+    EXPECT_EQ(application->activePromptSession(), promptSession);
+
+    applicationManager.onPromptSessionStopping(promptSession);
+
+    EXPECT_EQ(application->activePromptSession(), nullptr);
+}
+
+TEST_F(ApplicationManagerTests, applicationFocusesPromptSessionProviders)
+{
+    using namespace testing;
+    quint64 procId1 = 5551;
+    quint64 procId2 = 5552;
+
+    auto application = startApplication(procId1, "webapp");
+
+    std::shared_ptr<mir::scene::PromptSession> promptSession = std::make_shared<MockPromptSession>();
+
+    ON_CALL(promptSessionManager, application_for(promptSession)).WillByDefault(Return(application->session()));
+    ON_CALL(promptSessionManager, helper_for(promptSession)).WillByDefault(Return(std::shared_ptr<mir::scene::Session>()));
+
+    std::shared_ptr<mir::scene::Surface> aSurface(nullptr);
+    applicationManager.onSessionCreatedSurface(application->session().get(), aSurface);
+
+    std::shared_ptr<testing::MockSession> providerSession = std::make_shared<MockSession>("", procId2);
+    // TODO: Use mock!
+    std::shared_ptr<mir::scene::Surface> providerSurface((mir::scene::Surface*)__LINE__, [](mir::scene::Surface*) {});
+    ON_CALL(*providerSession, default_surface()).WillByDefault(Return(providerSurface));
+
+    applicationManager.onSessionStarting(providerSession);
+    EXPECT_EQ(application->foregroundSession(), application->session());
+
+    InSequence s;
+    EXPECT_CALL(focusController, set_focus_to(std::static_pointer_cast<mir::scene::Session>(providerSession))).Times(1);
+    EXPECT_CALL(focusController, set_focus_to(application->session())).Times(1);
+
+    applicationManager.onPromptSessionStarting(promptSession);
+
+    ON_CALL(promptSessionManager, for_each_provider_in(promptSession,_)).WillByDefault(InvokeArgument<1>(providerSession));
+    applicationManager.onPromptProviderAdded(promptSession.get(), providerSession);
+    EXPECT_EQ(application->foregroundSession(), providerSession);
+
+    ON_CALL(promptSessionManager, for_each_provider_in(promptSession,_)).WillByDefault(Return());
+    applicationManager.onPromptProviderRemoved(promptSession.get(), providerSession);
+    EXPECT_EQ(application->foregroundSession(), application->session());
+}

=== modified file 'tests/mock_proc_info.h'
--- tests/mock_proc_info.h	2014-02-28 17:42:43 +0000
+++ tests/mock_proc_info.h	2014-07-10 11:50:19 +0000
@@ -27,9 +27,14 @@
 struct MockProcInfo : public unitymir::ProcInfo
 {
     MOCK_METHOD1(command_line, QByteArray(quint64));
-    std::unique_ptr<CommandLine> commandLine(quint64 pid)
-    {
-      return std::unique_ptr<CommandLine>(new CommandLine{command_line(pid)});
+    std::unique_ptr<CommandLine> commandLine(quint64 pid) override
+    {
+        return std::unique_ptr<CommandLine>(new CommandLine{command_line(pid)});
+    }
+
+    quint64 parentProcess(quint64 /* pid */) override
+    {
+        return 0;
     }
 };
 }

=== added file 'tests/mock_prompt_session.h'
--- tests/mock_prompt_session.h	1970-01-01 00:00:00 +0000
+++ tests/mock_prompt_session.h	2014-07-10 11:50:19 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MOCK_MIR_PROMPT_SESSION_H
+#define MOCK_MIR_PROMPT_SESSION_H
+
+#include <mir/scene/prompt_session.h>
+#include <gmock/gmock.h>
+
+namespace testing
+{
+struct MockPromptSession : public mir::scene::PromptSession
+{
+};
+}
+
+#endif // MOCK_MIR_PROMPT_SESSION_H

=== added file 'tests/mock_prompt_session_manager.h'
--- tests/mock_prompt_session_manager.h	1970-01-01 00:00:00 +0000
+++ tests/mock_prompt_session_manager.h	2014-07-10 11:50:19 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MOCK_MIR_SCENE_PROMPT_SESSION_MANAGER_H_
+#define MOCK_MIR_SCENE_PROMPT_SESSION_MANAGER_H_
+
+#include "mir/scene/prompt_session_manager.h"
+#include "mir/scene/prompt_session_creation_parameters.h"
+
+#include <gmock/gmock.h>
+
+namespace testing
+{
+
+class MockPromptSessionManager: public mir::scene::PromptSessionManager
+{
+public:
+    MOCK_CONST_METHOD2(start_prompt_session_for, std::shared_ptr<mir::scene::PromptSession>(std::shared_ptr<mir::scene::Session> const&,
+        mir::scene::PromptSessionCreationParameters const&));
+
+    MOCK_CONST_METHOD1(stop_prompt_session, void(std::shared_ptr<mir::scene::PromptSession> const&));
+
+    MOCK_CONST_METHOD2(add_prompt_provider, void(std::shared_ptr<mir::scene::PromptSession> const&,
+        std::shared_ptr<mir::scene::Session> const&));
+
+    MOCK_CONST_METHOD2(add_prompt_provider_by_pid, void(std::shared_ptr<mir::scene::PromptSession> const&,
+        pid_t));
+
+    MOCK_CONST_METHOD1(add_expected_session, void(std::shared_ptr<mir::scene::Session> const&));
+
+    MOCK_CONST_METHOD1(remove_session, void(std::shared_ptr<mir::scene::Session> const&));
+
+    MOCK_CONST_METHOD1(application_for, std::shared_ptr<mir::scene::Session>(std::shared_ptr<mir::scene::PromptSession> const&));
+
+    MOCK_CONST_METHOD1(helper_for, std::shared_ptr<mir::scene::Session>(std::shared_ptr<mir::scene::PromptSession> const&));
+
+    MOCK_CONST_METHOD2(for_each_provider_in, void(std::shared_ptr<mir::scene::PromptSession> const&,
+        std::function<void(std::shared_ptr<mir::scene::Session> const&)> const&));
+};
+
+} // namespace testing
+
+#endif // MOCK_MIR_SCENE_PROMPT_SESSION_MANAGER_H_

=== modified file 'tests/mock_session.h'
--- tests/mock_session.h	2014-06-18 15:15:39 +0000
+++ tests/mock_session.h	2014-07-10 11:50:19 +0000
@@ -30,7 +30,7 @@
 struct MockSession : public mir::scene::Session
 {
     MockSession() {}
-    MockSession(std::string const& sessionName, pid_t processId) 
+    MockSession(std::string const& sessionName, pid_t processId)
         : m_sessionName(sessionName), m_sessionId(processId)
     {}