Merge lp:~mterry/unity8/greeter-active into lp:unity8

[Michael Terry]

Add an indicator to the greeter when a user is logged in (only shown if we have more than one user)

While in the area, I fixed the moveDuration time from an arbitrary(?) 200ms to an on-brand 165ms. Seems the same to me.

I couldn't think of a test for the active indicator that was more than a reiteration of the visible binding. So I didn't bother adding one.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 Just pre-req

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 I followed the design visuals for this, so design is pre-approved.
 https://docs.google.com/document/d/1X_doNFMLNDxsN3VcGM9I_tDlyzmao3MboQXW9duiAMc

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2048
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1842/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2400
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1299/console
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1299
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1299
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2428
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2315
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2315
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2315
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2308/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2308/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2308/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2308/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2308/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2308/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2308/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2308/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2308
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2308/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1842/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/greeter-active]

2552. By Launchpad Translations on behalf of unity-team on 2016-07-30

Launchpad automatic translations update.

2553. By Michael Terry on 2016-08-04

Connect our mock AccountsService background files with our mock liblightdm background files

2554. By Michael Terry on 2016-08-04

Fix deb build

2555. By Michael Terry on 2016-08-05

Fix usersmodel test

2556. By Michael Terry on 2016-08-11

Merge greeter-apps

2557. By Michael Terry on 2016-08-11

Merge greeter-apps

2558. By Michael Terry on 2016-08-22

Just always link to mock liblightdm, especially now that our mock AS module needs it

2559. By Michael Terry on 2016-08-22

Don't set mock backgrounds if none exist

2560. By Michael Terry on 2016-08-30

Merge greeter-apps

2561. By Michael Terry on 2016-08-30

Add an indicator to the greeter when a user is logged in (only shown if we have more than one user)

2562. By Michael Terry on 2016-09-06

Merge greeter-mock-bg

Unmerged revisions

=== modified file 'data/unity8-greeter-wrapper'
--- data/unity8-greeter-wrapper	2016-06-14 17:53:56 +0000
+++ data/unity8-greeter-wrapper	2016-08-11 17:58:52 +0000
@@ -1,8 +1,7 @@
 #!/bin/sh
 # -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2011,2013 Canonical Ltd
-# Author: Michael Terry <[e-mail]>
+# Copyright (C) 2011,2013,2016 Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -42,6 +41,8 @@
 SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
 rm -f $SUB_SOCKET # clear socket in case we were hard shut down
 
+echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >"$XDG_RUNTIME_DIR/dbus-session"
+
 # If touch session script (which sets up grid units and mir variables) is available, use it
 TOUCH_WRAPPER=
 if [ -x /usr/bin/ubuntu-touch-session ]; then
@@ -65,7 +66,14 @@
 MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &
 INIT_PID=$!
 while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
-export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
+. "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session"
+export UPSTART_SESSION
+
+# Connect upstart to system, but do first command in a loop to avoid any
+# race condition between the session file above being written and upstart being
+# ready to handle requests.
+while ! /sbin/initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS"; do sleep 0.1; done
+/sbin/initctl start notify-cgmanager
 
 # Start any pre-greeter tasks if needed (like wizard)
 /sbin/initctl emit unity8-greeter-starting

=== modified file 'debian/control'
--- debian/control	2016-08-03 15:53:00 +0000
+++ debian/control	2016-08-11 17:58:52 +0000
@@ -132,6 +132,7 @@
          ${shlibs:Depends},
 Recommends: indicator-keyboard,
             indicator-session,
+            unity-greeter-session-broadcast,
             unity-scope-click,
             unity-scope-mediascanner2,
 Breaks: indicator-network (<< 0.5.1+14.10.20141014),

=== modified file 'debian/rules'
--- debian/rules	2016-06-20 14:56:40 +0000
+++ debian/rules	2016-08-11 17:58:52 +0000
@@ -37,6 +37,7 @@
 override_dh_makeshlibs:
 	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
 
-# libMockLightDM-qml.so links against liblightdm-qt5-3.so which doesn't exist
 override_dh_shlibdeps:
-	dh_shlibdeps -XlibMockLightDM-qml.so
+	# Some mock libraries link against liblightdm-qt5-3.so which we want to
+	# avoid, since we only really link against our mock one, not the system one.
+	dh_shlibdeps -XlibMockLightDM-qml.so -XlibMockAccountsService-qml.so

=== modified file 'plugins/SessionBroadcast/SessionBroadcast.cpp'
--- plugins/SessionBroadcast/SessionBroadcast.cpp	2016-04-19 20:36:29 +0000
+++ plugins/SessionBroadcast/SessionBroadcast.cpp	2016-08-11 17:58:52 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,12 +12,12 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Michael Terry <[e-mail]>
  */
 
 #include "SessionBroadcast.h"
 #include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
 
 #include <glib.h>
 
@@ -27,13 +27,39 @@
     m_username = QString::fromUtf8(g_get_user_name());
 
     auto connection = QDBusConnection::SM_BUSNAME();
-
-    connection.connect(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
-                       QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
-                       QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
-                       QStringLiteral("ShowHome"),
-                       this,
-                       SLOT(onShowHome(const QString &)));
+    auto interface = connection.interface();
+    interface->startService(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"));
+
+    m_broadcaster = new QDBusInterface(QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
+                                       QStringLiteral("/com/canonical/Unity/Greeter/Broadcast"),
+                                       QStringLiteral("com.canonical.Unity.Greeter.Broadcast"),
+                                       connection, this);
+
+    connect(m_broadcaster, SIGNAL(StartUrl(const QString &, const QString &)),
+            this, SLOT(onStartUrl(const QString &, const QString &)));
+
+    connect(m_broadcaster, SIGNAL(ShowHome(const QString &)),
+            this, SLOT(onShowHome(const QString &)));
+}
+
+void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
+{
+    m_broadcaster->asyncCall(QStringLiteral("RequestUrlStart"), username, url);
+}
+
+void SessionBroadcast::requestHomeShown(const QString &username)
+{
+    m_broadcaster->asyncCall(QStringLiteral("RequestHomeShown"), username);
+}
+
+void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
+{
+    // Since this signal is just used for testing, we don't *really* care if
+    // username matches, but just in case we do eventually use the signal, we
+    // should only listen to our own requests.
+    if (username == m_username) {
+        Q_EMIT startUrl(url);
+    }
 }
 
 void SessionBroadcast::onShowHome(const QString &username)

=== modified file 'plugins/SessionBroadcast/SessionBroadcast.h'
--- plugins/SessionBroadcast/SessionBroadcast.h	2016-04-06 19:03:42 +0000
+++ plugins/SessionBroadcast/SessionBroadcast.h	2016-08-11 17:58:52 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Michael Terry <[e-mail]>
  */
 
 #ifndef UNITY_SESSIONBROADCAST_H
@@ -31,14 +29,23 @@
 public:
     explicit SessionBroadcast(QObject *parent = 0);
 
+    Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
+    Q_INVOKABLE void requestHomeShown(const QString &username);
+
 Q_SIGNALS:
+    // This signal isn't actually used by the shell
+    // (unity-greeter-session-broadcast handles launching an app for us), but
+    // it's useful for testing the plugin.
+    void startUrl(const QString &url);
     void showHome();
 
 private Q_SLOTS:
+    void onStartUrl(const QString &username, const QString &url);
     void onShowHome(const QString &username);
 
 private:
     QString m_username;
+    QDBusInterface *m_broadcaster;
 };
 
 #endif

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2016-06-27 18:45:27 +0000
+++ plugins/Utils/CMakeLists.txt	2016-08-11 17:58:52 +0000
@@ -29,6 +29,7 @@
     inputeventgenerator.cpp
     deviceconfigparser.cpp
     globalfunctions.cpp
+    URLDispatcher.cpp
     plugin.cpp
     )
 

=== added file 'plugins/Utils/URLDispatcher.cpp'
--- plugins/Utils/URLDispatcher.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/URLDispatcher.cpp	2016-08-11 17:58:52 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "URLDispatcher.h"
+
+#include <QDBusConnection>
+
+class URLDispatcherInterface : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.URLDispatcher")
+
+public:
+    explicit URLDispatcherInterface(URLDispatcher *parent);
+
+    Q_SCRIPTABLE void DispatchURL(const QString &url, const QString &package);
+};
+
+URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)
+  : QObject(parent)
+{
+}
+
+void URLDispatcherInterface::DispatchURL(const QString &url, const QString &package)
+{
+    Q_UNUSED(package);
+    Q_EMIT static_cast<URLDispatcher *>(parent())->urlRequested(url);
+}
+
+URLDispatcher::URLDispatcher(QObject *parent)
+  : QObject(parent)
+  , m_dispatcher(nullptr)
+{
+}
+
+bool URLDispatcher::active() const
+{
+    return m_dispatcher != nullptr;
+}
+
+void URLDispatcher::setActive(bool value)
+{
+    if (value == active())
+        return;
+
+    QDBusConnection connection = QDBusConnection::sessionBus();
+
+    if (value) {
+        URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);
+        connection.registerObject(QStringLiteral("/com/canonical/URLDispatcher"),
+                                  dispatcher,
+                                  QDBusConnection::ExportScriptableContents);
+        connection.registerService(QStringLiteral("com.canonical.URLDispatcher"));
+        m_dispatcher = dispatcher;
+    } else {
+        connection.unregisterService(QStringLiteral("com.canonical.URLDispatcher"));
+        delete m_dispatcher;
+        m_dispatcher = nullptr;
+    }
+
+    Q_EMIT activeChanged();
+}
+
+#include "URLDispatcher.moc"

=== added file 'plugins/Utils/URLDispatcher.h'
--- plugins/Utils/URLDispatcher.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/URLDispatcher.h	2016-08-11 17:58:52 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_URLDISPATCHER_H
+#define UNITY_URLDISPATCHER_H
+
+#include <QObject>
+#include <QString>
+
+// This class manages our url-dispatcher interception.  We intercept
+// url-dispatcher because rather than spawning the handler for the URL
+// in our own session, we want to notify the user session to do it for us
+// (and start an unlock in the process).
+
+class URLDispatcher : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+
+public:
+    explicit URLDispatcher(QObject *parent=0);
+
+    bool active() const;
+    void setActive(bool active);
+
+Q_SIGNALS:
+    void urlRequested(const QString &url);
+    void activeChanged();
+
+private:
+    QObject *m_dispatcher;
+};
+
+#endif

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2016-04-29 20:07:03 +0000
+++ plugins/Utils/plugin.cpp	2016-08-11 17:58:52 +0000
@@ -38,6 +38,7 @@
 #include "inputeventgenerator.h"
 #include "deviceconfigparser.h"
 #include "globalfunctions.h"
+#include "URLDispatcher.h"
 
 static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -80,4 +81,5 @@
     qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
     qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
     qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
+    qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
 }

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2016-08-11 17:58:51 +0000
+++ qml/Greeter/Greeter.qml	2016-08-11 17:58:52 +0000
@@ -105,8 +105,8 @@
         }
     }
 
-    // Notify that the user has explicitly requested the given app through unity8 GUI.
-    function notifyUserRequestedApp(appId) {
+    // Notify that the user has explicitly requested an app
+    function notifyUserRequestedApp() {
         if (!active) {
             return;
         }

=== modified file 'qml/Greeter/LoginList.qml'
--- qml/Greeter/LoginList.qml	2016-08-11 17:58:51 +0000
+++ qml/Greeter/LoginList.qml	2016-08-11 17:58:52 +0000
@@ -34,7 +34,7 @@
     readonly property int numAboveBelow: 4
     readonly property int cellHeight: units.gu(5)
     readonly property int highlightedHeight: units.gu(15)
-    readonly property int moveDuration: 200
+    readonly property int moveDuration: UbuntuAnimation.FastDuration
     property string selectedSession
     property string currentSession
     readonly property string currentUser: userList.currentItem.username
@@ -201,9 +201,22 @@
                     bottomMargin: -(units.gu(4) + (parent.belowHighlight ? parent.belowOffset : 0))
                 }
                 text: realName
-                color: userList.currentIndex !== index ? theme.palette.normal.raised : theme.palette.normal.raisedText
+                color: userList.currentIndex !== index ? theme.palette.normal.raised
+                                                       : theme.palette.normal.raisedText
 
                 Behavior on anchors.topMargin { NumberAnimation { duration: root.moveDuration; easing.type: Easing.InOutQuad; } }
+
+                Rectangle {
+                    id: activeIndicator
+                    anchors.horizontalCenter: parent.left
+                    anchors.horizontalCenterOffset: -units.gu(1)
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: userList.currentIndex !== index ? theme.palette.normal.raised
+                                                           : theme.palette.normal.focus
+                    visible: userList.count > 1 && loggedIn
+                    height: units.gu(0.5)
+                    width: height
+                }
             }
 
             MouseArea {

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-08-03 15:52:10 +0000
+++ qml/Shell.qml	2016-08-11 17:58:52 +0000
@@ -151,6 +151,22 @@
     readonly property alias greeter: greeterLoader.item
 
     function activateApplication(appId) {
+        // Either open the app in our own session, or -- if we're acting as a
+        // greeter -- ask the user's session to open it for us.
+        if (shell.mode === "greeter") {
+            activateURL("application:///" + appId + ".desktop");
+        } else {
+            startApp(appId);
+        }
+    }
+
+    function activateURL(url) {
+        SessionBroadcast.requestUrlStart(AccountsService.user, url);
+        greeter.notifyUserRequestedApp();
+        panel.indicators.hide();
+    }
+
+    function startApp(appId) {
         if (ApplicationManager.findApplication(appId)) {
             ApplicationManager.requestFocusApplication(appId);
         } else {
@@ -162,7 +178,7 @@
         if (greeter.locked) {
             greeter.lockedApp = app;
         }
-        shell.activateApplication(app);
+        startApp(app); // locked apps are always in our same session
     }
 
     Binding {
@@ -259,9 +275,7 @@
                                            ? "phone"
                                            : shell.usageScenario
             readonly property string qmlComponent: {
-                if (shell.mode === "greeter") {
-                    return "Stages/AbstractStage.qml"
-                } else if (applicationsDisplayLoader.usageScenario === "phone") {
+                if (applicationsDisplayLoader.usageScenario === "phone") {
                     return "Stages/PhoneStage.qml";
                 } else if (applicationsDisplayLoader.usageScenario === "tablet") {
                     return "Stages/TabletStage.qml";
@@ -499,11 +513,15 @@
     }
 
     function showHome() {
-        greeter.notifyUserRequestedApp("unity8-dash");
+        greeter.notifyUserRequestedApp();
 
-        var animate = !LightDMService.greeter.active && !stages.shown
-        dash.setCurrentScope(0, animate, false)
-        ApplicationManager.requestFocusApplication("unity8-dash")
+        if (shell.mode === "greeter") {
+            SessionBroadcast.requestHomeShown(AccountsService.user);
+        } else {
+            var animate = !LightDMService.greeter.active && !stages.shown;
+            dash.setCurrentScope(0, animate, false);
+            ApplicationManager.requestFocusApplication("unity8-dash");
+        }
     }
 
     function showDash() {
@@ -599,7 +617,7 @@
                 }
             }
             onLauncherApplicationSelected: {
-                greeter.notifyUserRequestedApp(appId);
+                greeter.notifyUserRequestedApp();
                 shell.activateApplication(appId);
             }
             onShownChanged: {
@@ -745,7 +763,14 @@
 
     Connections {
         target: SessionBroadcast
-        onShowHome: showHome()
+        onShowHome: if (shell.mode !== "greeter") showHome()
+    }
+
+    URLDispatcher {
+        id: urlDispatcher
+        objectName: "urlDispatcher"
+        active: shell.mode === "greeter"
+        onUrlRequested: shell.activateURL(url)
     }
 
     ItemGrabber {

=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2016-06-20 15:24:27 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2016-08-11 17:58:52 +0000
@@ -15,7 +15,9 @@
  */
 
 #include "AccountsService.h"
+#include "MockUsersModel.h"
 
+#include <QLightDM/UsersModel>
 #include <paths.h>
 
 AccountsService::AccountsService(QObject* parent)
@@ -23,15 +25,17 @@
     m_enableFingerprintIdentification(true),
     m_enableLauncherWhileLocked(true),
     m_enableIndicatorsWhileLocked(true),
-    m_backgroundFile(qmlDirectory() + "/graphics/phone_background.jpg"),
+    m_backgroundFile(),
     m_statsWelcomeScreen(true),
     m_failedLogins(0),
     m_failedFingerprintLogins(0),
     m_demoEdges(false),
     m_demoEdgesCompleted(),
     m_hereEnabled(false),
-    m_hereLicensePath("")
+    m_hereLicensePath(""),
+    m_usersModel(new MockUsersModel(this))
 {
+    m_usersModel->setMockMode("full");
 }
 
 QString AccountsService::user() const
@@ -44,6 +48,7 @@
     m_user = user;
     Q_EMIT userChanged();
     Q_EMIT passwordDisplayHintChanged();
+    Q_EMIT backgroundFileChanged();
 }
 
 bool AccountsService::demoEdges() const
@@ -111,7 +116,18 @@
 
 QString AccountsService::backgroundFile() const
 {
-    return m_backgroundFile;
+    if (!m_backgroundFile.isEmpty()) {
+        return m_backgroundFile;
+    }
+
+    // Check if our mock user has a background set in liblightdm
+    for (int i = 0; i < m_usersModel->count(); i++) {
+        if (m_usersModel->data(i, QLightDM::UsersModel::NameRole) == m_user) {
+            return m_usersModel->data(i, QLightDM::UsersModel::BackgroundPathRole).toString();
+        }
+    }
+
+    return QString();
 }
 
 void AccountsService::setBackgroundFile(const QString &backgroundFile)

=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2016-06-20 15:24:27 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2016-08-11 17:58:52 +0000
@@ -22,6 +22,8 @@
 #include <QStringList>
 #include <QVariant>
 
+class MockUsersModel;
+
 class AccountsService: public QObject
 {
     Q_OBJECT
@@ -163,6 +165,7 @@
     QString m_realName;
     QStringList m_kbdMap;
     QString m_email;
+    MockUsersModel *m_usersModel;
 };
 
 #endif

=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
--- tests/mocks/AccountsService/CMakeLists.txt	2014-07-02 16:17:14 +0000
+++ tests/mocks/AccountsService/CMakeLists.txt	2016-08-11 17:58:52 +0000
@@ -1,10 +1,24 @@
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM
+    ${CMAKE_SOURCE_DIR}/plugins/Utils
+    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
+    )
+
 add_library(MockAccountsService-qml MODULE
+    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
+    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp
     AccountsService.cpp
     plugin.cpp
     )
 
 qt5_use_modules(MockAccountsService-qml DBus Qml)
 
+target_link_libraries(MockAccountsService-qml
+    MockLightDM
+    )
+
 add_unity8_mock(AccountsService 0.1 AccountsService
     PREFIX mocks
     TARGETS MockAccountsService-qml

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2016-06-27 14:51:40 +0000
+++ tests/mocks/CMakeLists.txt	2016-08-11 17:58:52 +0000
@@ -39,6 +39,7 @@
 add_subdirectory(MeeGo)
 add_subdirectory(Powerd)
 add_subdirectory(QMenuModel)
+add_subdirectory(SessionBroadcast)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(QtMultimedia)

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp	2016-08-11 17:58:52 +0000
@@ -19,6 +19,11 @@
 #include <QLightDM/UsersModel>
 #include <QSortFilterProxyModel>
 
+MockUsersModel::MockUsersModel(QObject* parent)
+    : UsersModel(parent)
+{
+}
+
 QString MockUsersModel::mockMode() const
 {
     QLightDM::UsersModel* qUsersModel =

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h	2016-08-11 17:58:52 +0000
@@ -27,6 +27,8 @@
     Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
 
 public:
+    explicit MockUsersModel(QObject* parent=0);
+
     QString mockMode() const;
     void setMockMode(QString mockMode);
 

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-06-30 15:49:16 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-08-11 17:58:52 +0000
@@ -17,6 +17,8 @@
 #include "UsersModelPrivate.h"
 #include "UsersModel.h"
 
+#include <QDir>
+
 namespace QLightDM
 {
 
@@ -53,6 +55,15 @@
         entries[i].uid = i + 1;
     }
 
+    // Assign backgrounds
+    QDir backgroundDir("/usr/share/backgrounds");
+    QStringList backgrounds = backgroundDir.entryList(QDir::Files);
+    for (int i = 0; i < entries.size(); i++) {
+        if (entries[i].background.isNull()) {
+            entries[i].background = backgroundDir.filePath(backgrounds[i % backgrounds.size()]);
+        }
+    }
+
     q->endResetModel();
 }
 
@@ -96,7 +107,7 @@
         { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
         { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
         { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
-        { "color-background",  "Color Background", "#dd4814", 0, false, false, "ubuntu", 0 },
+        { "color-background",  "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
         // white and black are a bit redundant, but useful for manually testing if UI is still readable
         { "white-background",  "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
         { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
@@ -104,6 +115,7 @@
         { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
         { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
         { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
+        { "active",            "Active Account", 0, 0, true, false, "ubuntu", 0 },
     };
 }
 

=== added directory 'tests/mocks/SessionBroadcast'
=== added file 'tests/mocks/SessionBroadcast/CMakeLists.txt'
--- tests/mocks/SessionBroadcast/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/SessionBroadcast/CMakeLists.txt	2016-08-11 17:58:52 +0000
@@ -0,0 +1,8 @@
+add_library(MockSessionBroadcast-qml MODULE
+    plugin.cpp
+    SessionBroadcast.cpp
+    )
+
+qt5_use_modules(MockSessionBroadcast-qml Qml)
+
+add_unity8_mock(SessionBroadcast 0.1 SessionBroadcast TARGETS MockSessionBroadcast-qml)

=== added file 'tests/mocks/SessionBroadcast/SessionBroadcast.cpp'
--- tests/mocks/SessionBroadcast/SessionBroadcast.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/SessionBroadcast/SessionBroadcast.cpp	2016-08-11 17:58:52 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "SessionBroadcast.h"
+
+SessionBroadcast::SessionBroadcast(QObject* parent)
+  : QObject(parent)
+{
+}
+
+void SessionBroadcast::requestUrlStart(const QString &, const QString &url)
+{
+    // No user name guards, we won't worry about that aspect of the plugin here
+    Q_EMIT startUrl(url);
+}
+
+void SessionBroadcast::requestHomeShown(const QString &)
+{
+    // No user name guards, we won't worry about that aspect of the plugin here
+    Q_EMIT showHome();
+}

=== added file 'tests/mocks/SessionBroadcast/SessionBroadcast.h'
--- tests/mocks/SessionBroadcast/SessionBroadcast.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/SessionBroadcast/SessionBroadcast.h	2016-08-11 17:58:52 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2012,2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michael Terry <[e-mail]>
+ */
+
+#ifndef UNITY_MOCK_SESSIONBROADCAST_H
+#define UNITY_MOCK_SESSIONBROADCAST_H
+
+#include <QObject>
+
+class SessionBroadcast: public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit SessionBroadcast(QObject *parent = 0);
+
+    Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
+    Q_INVOKABLE void requestHomeShown(const QString &username);
+
+Q_SIGNALS:
+    void startUrl(const QString &url);
+    void showHome();
+};
+
+#endif

=== added file 'tests/mocks/SessionBroadcast/plugin.cpp'
--- tests/mocks/SessionBroadcast/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/SessionBroadcast/plugin.cpp	2016-08-11 17:58:52 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "SessionBroadcast.h"
+
+#include <QtQml/qqml.h>
+
+static QObject *broadcast_provider(QQmlEngine *, QJSEngine *)
+{
+    return new SessionBroadcast();
+}
+
+void PowerdPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("SessionBroadcast"));
+    qmlRegisterSingletonType<SessionBroadcast>(uri, 0, 1, "SessionBroadcast", broadcast_provider);
+}

=== added file 'tests/mocks/SessionBroadcast/plugin.h'
--- tests/mocks/SessionBroadcast/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/SessionBroadcast/plugin.h	2016-08-11 17:58:52 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_SESSIONBROADCAST_PLUGIN_H
+#define MOCK_SESSIONBROADCAST_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class PowerdPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri) override;
+};
+
+#endif

=== added file 'tests/mocks/SessionBroadcast/qmldir'
--- tests/mocks/SessionBroadcast/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/SessionBroadcast/qmldir	2016-08-11 17:58:52 +0000
@@ -0,0 +1,2 @@
+module SessionBroadcast
+plugin MockSessionBroadcast-qml

=== modified file 'tests/mocks/Utils/CMakeLists.txt'
--- tests/mocks/Utils/CMakeLists.txt	2016-06-02 09:32:33 +0000
+++ tests/mocks/Utils/CMakeLists.txt	2016-08-11 17:58:52 +0000
@@ -32,6 +32,7 @@
     constants.cpp
     plugin.cpp
     windowstatestorage.cpp
+    URLDispatcher.cpp
     )
 
 add_library(FakeUtils-qml SHARED

=== added file 'tests/mocks/Utils/URLDispatcher.cpp'
--- tests/mocks/Utils/URLDispatcher.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Utils/URLDispatcher.cpp	2016-08-11 17:58:52 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "URLDispatcher.h"
+
+#include <QDBusConnection>
+
+URLDispatcher::URLDispatcher(QObject *parent)
+  : QObject(parent)
+  , m_active(false)
+{
+}
+
+bool URLDispatcher::active() const
+{
+    return m_active;
+}
+
+void URLDispatcher::setActive(bool value)
+{
+    if (m_active != value) {
+        m_active = value;
+        Q_EMIT activeChanged();
+    }
+}

=== added file 'tests/mocks/Utils/URLDispatcher.h'
--- tests/mocks/Utils/URLDispatcher.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Utils/URLDispatcher.h	2016-08-11 17:58:52 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UNITY_URLDISPATCHER_H
+#define UNITY_URLDISPATCHER_H
+
+#include <QObject>
+#include <QString>
+
+// This class manages our url-dispatcher interception.  We intercept
+// url-dispatcher because rather than spawning the handler for the URL
+// in our own session, we want to notify the user session to do it for us
+// (and start an unlock in the process).
+
+class URLDispatcher : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+
+public:
+    explicit URLDispatcher(QObject *parent=0);
+
+    bool active() const;
+    void setActive(bool active);
+
+Q_SIGNALS:
+    void urlRequested(const QString &url);
+    void activeChanged();
+
+private:
+    bool m_active;
+};
+
+#endif

=== modified file 'tests/mocks/Utils/plugin.cpp'
--- tests/mocks/Utils/plugin.cpp	2016-04-29 20:07:03 +0000
+++ tests/mocks/Utils/plugin.cpp	2016-08-11 17:58:52 +0000
@@ -25,6 +25,7 @@
 #include "plugin.h"
 #include "windowstatestorage.h"
 #include "constants.h"
+#include "URLDispatcher.h"
 
 // plugin
 #include <activefocuslogger.h>
@@ -80,4 +81,5 @@
     qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
     qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
     qmlRegisterSingletonType<GlobalFunctions>(uri, 0, 1, "Functions", createGlobalFunctions);
+    qmlRegisterType<URLDispatcher>(uri, 0, 1, "URLDispatcher");
 }

=== modified file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt	2016-06-07 16:10:36 +0000
+++ tests/plugins/CMakeLists.txt	2016-08-11 17:58:52 +0000
@@ -4,6 +4,7 @@
 add_subdirectory(GlobalShortcut)
 add_subdirectory(Greeter)
 add_subdirectory(LightDM)
+add_subdirectory(SessionBroadcast)
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(Utils)

=== modified file 'tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp'
--- tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp	2015-09-28 18:00:44 +0000
+++ tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp	2016-08-11 17:58:52 +0000
@@ -59,10 +59,10 @@
     void testMangleColor()
     {
         QString background = getStringValue(sourceModel, "color-background", QLightDM::UsersModel::BackgroundPathRole);
-        QVERIFY(background == "#dd4814");
+        QVERIFY(background == "#E95420");
 
         background = getStringValue(model, "color-background", QLightDM::UsersModel::BackgroundPathRole);
-        QVERIFY(background == "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>");
+        QVERIFY(background == "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#E95420'/></svg>");
     }
 
     void testMangleEmptyName()

=== added directory 'tests/plugins/SessionBroadcast'
=== added file 'tests/plugins/SessionBroadcast/BroadcastServer.cpp'
--- tests/plugins/SessionBroadcast/BroadcastServer.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/SessionBroadcast/BroadcastServer.cpp	2016-08-11 17:58:52 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ */
+
+#include "BroadcastServer.h"
+
+BroadcastServer::BroadcastServer(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void BroadcastServer::RequestUrlStart(const QString &username, const QString &url)
+{
+    Q_EMIT StartUrl(username, url);
+}
+
+void BroadcastServer::RequestHomeShown(const QString &username)
+{
+    Q_EMIT ShowHome(username);
+}

=== added file 'tests/plugins/SessionBroadcast/BroadcastServer.h'
--- tests/plugins/SessionBroadcast/BroadcastServer.h	1970-01-01 00:00:00 +0000
+++ tests/plugins/SessionBroadcast/BroadcastServer.h	2016-08-11 17:58:52 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ */
+
+#ifndef UNITY_BROADCASTSERVER_H
+#define UNITY_BROADCASTSERVER_H
+
+#include <QDBusContext>
+#include <QObject>
+
+class BroadcastServer: public QObject, protected QDBusContext
+{
+    Q_OBJECT
+
+public:
+    explicit BroadcastServer(QObject *parent = nullptr);
+
+public Q_SLOTS:
+    void RequestUrlStart(const QString &username, const QString &url);
+    void RequestHomeShown(const QString &username);
+
+Q_SIGNALS:
+    void StartUrl(const QString &username, const QString &url);
+    void ShowHome(const QString &username);
+};
+
+#endif

=== added file 'tests/plugins/SessionBroadcast/CMakeLists.txt'
--- tests/plugins/SessionBroadcast/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/plugins/SessionBroadcast/CMakeLists.txt	2016-08-11 17:58:52 +0000
@@ -0,0 +1,45 @@
+macro(make_dbus_class NAME INTERFACE)
+    if(${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor.h)
+        execute_process(COMMAND ${QDBUSXML2CPP_EXECUTABLE} -c ${NAME}Adaptor -a ${CMAKE_CURRENT_BINARY_DIR}/${NAME}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${INTERFACE})
+    endif()
+endmacro(make_dbus_class)
+
+make_dbus_class(Broadcast com.canonical.Unity.Greeter.Broadcast)
+
+add_definitions(-DSM_BUSNAME=sessionBus)
+
+include_directories(
+    ${GLIB_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/plugins/SessionBroadcast
+)
+
+link_libraries(
+    ${GLIB_LIBRARIES}
+)
+
+add_executable(MockBroadcastServer
+    ${CMAKE_CURRENT_BINARY_DIR}/BroadcastAdaptor.cpp
+    server.cpp
+    BroadcastServer.cpp
+)
+qt5_use_modules(MockBroadcastServer Core DBus)
+
+### SessionBroadcastTest
+add_executable(sessionbroadcasttestExec
+    ${CMAKE_SOURCE_DIR}/plugins/SessionBroadcast/SessionBroadcast.cpp
+    sessionbroadcasttest.cpp
+)
+qt5_use_modules(sessionbroadcasttestExec Test Core Qml DBus)
+
+add_unity8_unittest(SessionBroadcast dbus-test-runner
+    ARG_PREFIX "--parameter"
+    ARGS
+        --task $<TARGET_FILE:MockBroadcastServer>
+        --task-name server
+        --ignore-return
+        --task $<TARGET_FILE:sessionbroadcasttestExec>
+        --task-name client
+        --wait-for com.canonical.Unity.Greeter.Broadcast
+)

=== added file 'tests/plugins/SessionBroadcast/interfaces.xml'
--- tests/plugins/SessionBroadcast/interfaces.xml	1970-01-01 00:00:00 +0000
+++ tests/plugins/SessionBroadcast/interfaces.xml	2016-08-11 17:58:52 +0000
@@ -0,0 +1,18 @@
+<node>
+  <interface name="com.canonical.Unity.Greeter.Broadcast">
+    <method name="RequestUrlStart">
+      <arg name="username" type="s" direction="in" />
+      <arg name="url" type="s" direction="in" />
+    </method>
+    <method name="RequestHomeShown">
+      <arg name="username" type="s" direction="in" />
+    </method>
+    <signal name="StartUrl">
+      <arg name="username" type="s" direction="out" />
+      <arg name="url" type="s" direction="out" />
+    </signal>
+    <signal name="ShowHome">
+      <arg name="username" type="s" direction="out" />
+    </signal>
+  </interface>
+</node>

=== added file 'tests/plugins/SessionBroadcast/server.cpp'
--- tests/plugins/SessionBroadcast/server.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/SessionBroadcast/server.cpp	2016-08-11 17:58:52 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ */
+
+#include "BroadcastAdaptor.h"
+#include "BroadcastServer.h"
+#include <QCoreApplication>
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+
+    auto broadcast = new BroadcastServer(&a);
+    new BroadcastAdaptor(broadcast);
+
+    // We use the session bus for testing.  The real plugin uses the system bus
+    auto connection = QDBusConnection::sessionBus();
+    if (!connection.registerObject("/com/canonical/Unity/Greeter/Broadcast", broadcast))
+        return 1;
+    if (!connection.registerService("com.canonical.Unity.Greeter.Broadcast"))
+        return 1;
+
+    return a.exec();
+}

=== added file 'tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp'
--- tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/SessionBroadcast/sessionbroadcasttest.cpp	2016-08-11 17:58:52 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2016 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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 <QtTest>
+#include <QDBusInterface>
+#include <QSignalSpy>
+
+#include <glib.h>
+
+#include "SessionBroadcast.h"
+
+class SessionBroadcastTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void initTestCase() {
+        broadcastServer = new QDBusInterface("com.canonical.Unity.Greeter.Broadcast",
+                                             "/com/canonical/Unity/Greeter/Broadcast",
+                                             "com.canonical.Unity.Greeter.Broadcast",
+                                             QDBusConnection::sessionBus(), this);
+        serverStartUrlSpy = new QSignalSpy(broadcastServer,
+                                           SIGNAL(StartUrl(const QString &, const QString &)));
+        serverShowHomeSpy = new QSignalSpy(broadcastServer,
+                                           SIGNAL(ShowHome(const QString &)));
+        user = QString(g_get_user_name());
+        otherUser = user + "2";
+    }
+
+    void init()
+    {
+        serverStartUrlSpy->clear();
+        serverShowHomeSpy->clear();
+
+        broadcastPlugin = new SessionBroadcast(this);
+        pluginStartUrlSpy = new QSignalSpy(broadcastPlugin,
+                                           SIGNAL(startUrl(const QString &)));
+        pluginShowHomeSpy = new QSignalSpy(broadcastPlugin,
+                                           SIGNAL(showHome()));
+    }
+
+    void cleanup()
+    {
+        delete broadcastPlugin;
+    }
+
+    void testReceiveUrlStart() {
+        broadcastServer->call("RequestUrlStart", user, "test:");
+        QTRY_COMPARE(serverStartUrlSpy->count(), 1);
+        QCOMPARE(pluginStartUrlSpy->count(), 1);
+        QCOMPARE((*pluginStartUrlSpy)[0][0], QVariant("test:"));
+    }
+
+    void testReceiveUrlStartOtherUser() {
+        broadcastServer->call("RequestUrlStart", otherUser, "test:");
+        QTRY_COMPARE(serverStartUrlSpy->count(), 1);
+        QCOMPARE(pluginStartUrlSpy->count(), 0);
+    }
+
+    void testReceiveShowHome() {
+        broadcastServer->call("RequestHomeShown", user);
+        QTRY_COMPARE(serverShowHomeSpy->count(), 1);
+        QCOMPARE(pluginShowHomeSpy->count(), 1);
+    }
+
+    void testReceiveShowHomeOtherUser() {
+        broadcastServer->call("RequestHomeShown", otherUser);
+        QTRY_COMPARE(serverShowHomeSpy->count(), 1);
+        QCOMPARE(pluginShowHomeSpy->count(), 0);
+    }
+
+    void testSendUrlStart() {
+        broadcastPlugin->requestUrlStart(otherUser, "test:");
+        QTRY_COMPARE(serverStartUrlSpy->count(), 1);
+        QCOMPARE((*serverStartUrlSpy)[0][0], QVariant(otherUser));
+        QCOMPARE((*serverStartUrlSpy)[0][1], QVariant("test:"));
+    }
+
+    void testSendShowHome() {
+        broadcastPlugin->requestHomeShown(otherUser);
+        QTRY_COMPARE(serverShowHomeSpy->count(), 1);
+        QCOMPARE((*serverShowHomeSpy)[0][0], QVariant(otherUser));
+    }
+
+private:
+    QDBusInterface *broadcastServer;
+    SessionBroadcast *broadcastPlugin;
+    QSignalSpy *serverStartUrlSpy;
+    QSignalSpy *serverShowHomeSpy;
+    QSignalSpy *pluginStartUrlSpy;
+    QSignalSpy *pluginShowHomeSpy;
+    QString user;
+    QString otherUser;
+};
+
+QTEST_GUILESS_MAIN(SessionBroadcastTest)
+#include "sessionbroadcasttest.moc"

=== modified file 'tests/plugins/Utils/CMakeLists.txt'
--- tests/plugins/Utils/CMakeLists.txt	2016-02-18 16:53:54 +0000
+++ tests/plugins/Utils/CMakeLists.txt	2016-08-11 17:58:52 +0000
@@ -23,3 +23,12 @@
 
 # plain qml test
 add_unity8_qmlunittest(. UtilsStyle)
+
+# URLDispatcher test needs dbus-test-runner because it claims a dbus name
+add_executable(URLDispatcherTestExec URLDispatcherTest.cpp)
+qt5_use_modules(URLDispatcherTestExec Test Core Qml)
+target_link_libraries(URLDispatcherTestExec Utils-qml)
+add_unity8_unittest(URLDispatcher dbus-test-runner
+    ARG_PREFIX "--parameter"
+    ARGS --task $<TARGET_FILE:URLDispatcherTestExec>
+)

=== added file 'tests/plugins/Utils/URLDispatcherTest.cpp'
--- tests/plugins/Utils/URLDispatcherTest.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Utils/URLDispatcherTest.cpp	2016-08-11 17:58:52 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "URLDispatcher.h"
+
+#include <QDBusInterface>
+#include <QSignalSpy>
+#include <QTest>
+
+class URLDispatcherTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void initTestCase() {
+        dispatchServer = new QDBusInterface("com.canonical.URLDispatcher",
+                                            "/com/canonical/URLDispatcher",
+                                            "com.canonical.URLDispatcher",
+                                            QDBusConnection::sessionBus(), this);
+    }
+
+    void init()
+    {
+        dispatcher = new URLDispatcher(this);
+        dispatchSpy = new QSignalSpy(dispatcher,
+                                     SIGNAL(urlRequested(const QString &)));
+    }
+
+    void cleanup()
+    {
+        delete dispatcher;
+    }
+
+    void testInactiveByDefault() {
+        QVERIFY(!dispatcher->active());
+    }
+
+    void testActiveRequest() {
+        dispatcher->setActive(true);
+        dispatchServer->call("DispatchURL", "test:", "package");
+        QCOMPARE(dispatchSpy->count(), 1);
+        QCOMPARE((*dispatchSpy)[0][0], QVariant("test:"));
+    }
+
+    void testInactiveRequest() {
+        dispatchServer->call("DispatchURL", "test:", "package");
+        QCOMPARE(dispatchSpy->count(), 0);
+    }
+
+    void testInactiveAfterActiveRequest() {
+        dispatcher->setActive(true);
+        dispatcher->setActive(false);
+        dispatchServer->call("DispatchURL", "test:", "package");
+        QCOMPARE(dispatchSpy->count(), 0);
+    }
+
+private:
+    QDBusInterface *dispatchServer;
+    URLDispatcher *dispatcher;
+    QSignalSpy *dispatchSpy;
+};
+
+QTEST_GUILESS_MAIN(URLDispatcherTest)
+#include "URLDispatcherTest.moc"

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2016-08-03 15:53:36 +0000
+++ tests/qmltests/tst_Shell.qml	2016-08-11 17:58:52 +0000
@@ -19,6 +19,7 @@
 import AccountsService 0.1
 import GSettings 1.0
 import LightDM.IntegratedLightDM 0.1 as LightDM
+import SessionBroadcast 0.1
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Telephony 0.1 as Telephony
@@ -406,6 +407,18 @@
     }
 
     SignalSpy {
+        id: broadcastUrlSpy
+        target: SessionBroadcast
+        signalName: "startUrl"
+    }
+
+    SignalSpy {
+        id: broadcastHomeSpy
+        target: SessionBroadcast
+        signalName: "showHome"
+    }
+
+    SignalSpy {
         id: unlockAllModemsSpy
         target: Connectivity
         signalName: "unlockingAllModems"
@@ -546,6 +559,8 @@
             LightDM.Greeter.authenticate(""); // reset greeter
 
             sessionSpy.clear();
+            broadcastUrlSpy.clear();
+            broadcastHomeSpy.clear();
 
             GSettingsController.setLifecycleExemptAppids([]);
 
@@ -2410,6 +2425,66 @@
             compare(topmostSurfaceItem.touchReleaseCount, 2);
         }
 
+        function test_greeterModeBroadcastsApp() {
+            setLightDMMockMode("single-pin");
+            shellLoader.mode = "greeter";
+            loadShell("phone");
+            shell.usageScenario = "phone";
+            waitForRendering(shell);
+
+            dragLauncherIntoView();
+            var appIcon = findChild(shell, "launcherDelegate0")
+            tap(appIcon);
+
+            tryCompare(broadcastUrlSpy, "count", 1);
+            compare(broadcastUrlSpy.signalArguments[0][0], "application:///" + appIcon.appId + ".desktop");
+            compare(ApplicationManager.count, 1); // confirm only dash is open, we didn't start new app
+
+            var coverPage = findChild(shell, "coverPage");
+            tryCompare(coverPage, "showProgress", 0);
+        }
+
+        function test_greeterModeBroadcastsHome() {
+            setLightDMMockMode("single-pin");
+            shellLoader.mode = "greeter";
+            loadShell("phone");
+            shell.usageScenario = "phone";
+            waitForRendering(shell);
+
+            var gallerySurfaceId = topLevelSurfaceList.nextId;
+            var galleryApp = ApplicationManager.startApplication("gallery-app");
+            waitUntilAppWindowIsFullyLoaded(gallerySurfaceId);
+            compare(ApplicationManager.focusedApplicationId, "gallery-app");
+
+            dragLauncherIntoView();
+            tap(findChild(shell, "buttonShowDashHome"));
+
+            tryCompare(broadcastHomeSpy, "count", 1);
+            compare(ApplicationManager.focusedApplicationId, "gallery-app"); // confirm we didn't focus dash
+
+            var coverPage = findChild(shell, "coverPage");
+            tryCompare(coverPage, "showProgress", 0);
+        }
+
+        function test_greeterModeDispatchesURL() {
+            setLightDMMockMode("single-pin");
+            shellLoader.mode = "greeter";
+            loadShell("phone");
+            shell.usageScenario = "phone";
+            waitForRendering(shell);
+
+            var urlDispatcher = findInvisibleChild(shell, "urlDispatcher");
+            verify(urlDispatcher.active);
+            urlDispatcher.urlRequested("test:"); // force signal emission
+
+            tryCompare(broadcastUrlSpy, "count", 1);
+            compare(broadcastUrlSpy.signalArguments[0][0], "test:");
+            compare(ApplicationManager.count, 1); // confirm only dash is open, we didn't start new app
+
+            var coverPage = findChild(shell, "coverPage");
+            tryCompare(coverPage, "showProgress", 0);
+        }
+
         function test_switchKeymap() {
             // start with phone shell
             loadShell("phone");