Merge lp:~mzanetti/unity8/miral-qt54 into lp:unity8

[Michael Zanetti]

just so I can test this on something with a touchscreen

[lp:~mzanetti/unity8/miral-qt54]

2677. By Michael Zanetti on 2016-11-09

fix typo

Unmerged revisions

2677. By Michael Zanetti on 2016-11-09

fix typo

2676. By Michael Zanetti on 2016-11-09

make it build with Qt 5.4

2675. By Daniel d'Andrada on 2016-11-08

Let the model deal with some window management decisions

eg: which window to focus, whether to change surface state

unit8 requests and reacts to changes in the model instead of applying them

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-24 11:34:08 +0000
+++ CMakeLists.txt	2016-11-09 15:21:35 +0000
@@ -57,7 +57,7 @@
 find_package(Qt5Concurrent 5.4 REQUIRED)
 find_package(Qt5Sql 5.4 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=22)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
 pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

=== modified file 'debian/control'
--- debian/control	2016-10-27 12:25:58 +0000
+++ debian/control	2016-11-09 15:21:35 +0000
@@ -38,7 +38,7 @@
                libubuntugestures5-private-dev (>= 1.3.2030),
                libudev-dev,
                libudm-common-dev,
-               libunity-api-dev (>= 7.119),
+               libunity-api-dev (>= 7.120),
                libusermetricsoutput1-dev,
 # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                libx11-dev[!arm64 !armhf],
@@ -158,7 +158,7 @@
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
          ubuntu-wallpapers,
-         unity-application-impl-22,
+         unity-application-impl-23,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-12,
@@ -204,7 +204,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-22,
+          unity-application-impl-23,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2016-08-30 14:06:47 +0000
+++ debian/unity8-private.install	2016-11-09 15:21:35 +0000
@@ -14,7 +14,6 @@
 usr/lib/*/unity8/qml/Unity
 usr/lib/*/unity8/qml/UInput
 usr/lib/*/unity8/qml/Utils
-usr/lib/*/unity8/qml/WindowManager
 usr/lib/*/unity8/qml/Wizard
 usr/share/accountsservice/interfaces
 usr/share/dbus-1/interfaces

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2016-08-30 14:06:47 +0000
+++ plugins/CMakeLists.txt	2016-11-09 15:21:35 +0000
@@ -26,5 +26,4 @@
 add_subdirectory(UInput)
 add_subdirectory(Unity)
 add_subdirectory(Utils)
-add_subdirectory(WindowManager)
 add_subdirectory(Wizard)

=== removed directory 'plugins/WindowManager'
=== removed file 'plugins/WindowManager/CMakeLists.txt'
--- plugins/WindowManager/CMakeLists.txt	2016-06-20 09:43:38 +0000
+++ plugins/WindowManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-set(WINDOWMANAGER_SRC
-    TopLevelSurfaceList.cpp
-    WindowManagerPlugin.cpp
-    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
-    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
-    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
-    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
-   )
-
-add_library(windowmanager-qml SHARED ${WINDOWMANAGER_SRC})
-
-qt5_use_modules(windowmanager-qml Qml Quick Gui)
-
-add_unity8_plugin(WindowManager 0.1 WindowManager TARGETS windowmanager-qml)

=== removed file 'plugins/WindowManager/TopLevelSurfaceList.cpp'
--- plugins/WindowManager/TopLevelSurfaceList.cpp	2016-09-14 15:02:01 +0000
+++ plugins/WindowManager/TopLevelSurfaceList.cpp	1970-01-01 00:00:00 +0000
@@ -1,481 +0,0 @@
-/*
- * 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 "TopLevelSurfaceList.h"
-
-// unity-api
-#include <unity/shell/application/ApplicationInfoInterface.h>
-#include <unity/shell/application/MirSurfaceInterface.h>
-#include <unity/shell/application/MirSurfaceListInterface.h>
-
-#include <QMetaObject>
-
-Q_LOGGING_CATEGORY(UNITY_TOPSURFACELIST, "unity.topsurfacelist", QtDebugMsg)
-
-#define DEBUG_MSG qCDebug(UNITY_TOPSURFACELIST).nospace().noquote() << __func__
-
-using namespace unity::shell::application;
-
-TopLevelSurfaceList::TopLevelSurfaceList(QObject *parent) :
-    QAbstractListModel(parent)
-{
-    DEBUG_MSG << "()";
-}
-
-TopLevelSurfaceList::~TopLevelSurfaceList()
-{
-    DEBUG_MSG << "()";
-}
-
-int TopLevelSurfaceList::rowCount(const QModelIndex &parent) const
-{
-    return !parent.isValid() ? m_surfaceList.size() : 0;
-}
-
-QVariant TopLevelSurfaceList::data(const QModelIndex& index, int role) const
-{
-    if (index.row() < 0 || index.row() >= m_surfaceList.size())
-        return QVariant();
-
-    if (role == SurfaceRole) {
-        MirSurfaceInterface *surface = m_surfaceList.at(index.row()).surface;
-        return QVariant::fromValue(surface);
-    } else if (role == ApplicationRole) {
-        return QVariant::fromValue(m_surfaceList.at(index.row()).application);
-    } else if (role == IdRole) {
-        return QVariant::fromValue(m_surfaceList.at(index.row()).id);
-    } else {
-        return QVariant();
-    }
-}
-
-void TopLevelSurfaceList::raise(MirSurfaceInterface *surface)
-{
-    if (!surface)
-        return;
-
-    DEBUG_MSG << "(MirSurface[" << (void*)surface << "])";
-
-    int i = indexOf(surface);
-    if (i != -1) {
-        raiseId(m_surfaceList.at(i).id);
-    }
-}
-
-void TopLevelSurfaceList::appendPlaceholder(ApplicationInfoInterface *application)
-{
-    DEBUG_MSG << "(" << application->appId() << ")";
-
-    appendSurfaceHelper(nullptr, application);
-}
-
-void TopLevelSurfaceList::appendSurface(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
-{
-    Q_ASSERT(surface != nullptr);
-
-    bool filledPlaceholder = false;
-    for (int i = 0; i < m_surfaceList.count() && !filledPlaceholder; ++i) {
-        ModelEntry &entry = m_surfaceList[i];
-        if (entry.application == application && entry.surface == nullptr) {
-            entry.surface = surface;
-            connectSurface(surface);
-            DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface
-                      << ", filling out placeholder. after: " << toString();
-            Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
-            filledPlaceholder = true;
-        }
-    }
-
-    if (!filledPlaceholder) {
-        DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
-        appendSurfaceHelper(surface, application);
-    }
-}
-
-void TopLevelSurfaceList::appendSurfaceHelper(MirSurfaceInterface *surface, ApplicationInfoInterface *application)
-{
-    if (m_modelState == IdleState) {
-        m_modelState = InsertingState;
-        beginInsertRows(QModelIndex(), m_surfaceList.size() /*first*/, m_surfaceList.size() /*last*/);
-    } else {
-        Q_ASSERT(m_modelState == ResettingState);
-        // No point in signaling anything if we're resetting the whole model
-    }
-
-    int id = generateId();
-    m_surfaceList.append(ModelEntry(surface, application, id));
-    if (surface) {
-        connectSurface(surface);
-    }
-
-    if (m_modelState == InsertingState) {
-        endInsertRows();
-        Q_EMIT countChanged();
-        Q_EMIT listChanged();
-        m_modelState = IdleState;
-    }
-
-    DEBUG_MSG << " after " << toString();
-}
-
-void TopLevelSurfaceList::connectSurface(MirSurfaceInterface *surface)
-{
-    connect(surface, &MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
-            if (!live) {
-                onSurfaceDied(surface);
-            }
-        });
-    connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
-}
-
-void TopLevelSurfaceList::onSurfaceDied(MirSurfaceInterface *surface)
-{
-    int i = indexOf(surface);
-    if (i == -1) {
-        return;
-    }
-
-    auto application = m_surfaceList[i].application;
-
-    // can't be starting if it already has a surface
-    Q_ASSERT(application->state() != ApplicationInfoInterface::Starting);
-
-    if (application->state() == ApplicationInfoInterface::Running) {
-        m_surfaceList[i].removeOnceSurfaceDestroyed = true;
-    } else {
-        // assume it got killed by the out-of-memory daemon.
-        //
-        // So leave entry in the model and only remove its surface, so shell can display a screenshot
-        // in its place.
-        m_surfaceList[i].removeOnceSurfaceDestroyed = false;
-    }
-}
-
-void TopLevelSurfaceList::onSurfaceDestroyed(MirSurfaceInterface *surface)
-{
-    int i = indexOf(surface);
-    if (i == -1) {
-        return;
-    }
-
-    if (m_surfaceList[i].removeOnceSurfaceDestroyed) {
-        removeAt(i);
-    } else {
-        m_surfaceList[i].surface = nullptr;
-        Q_EMIT dataChanged(index(i) /* topLeft */, index(i) /* bottomRight */, QVector<int>() << SurfaceRole);
-        DEBUG_MSG << " Removed surface from entry. After: " << toString();
-    }
-}
-
-void TopLevelSurfaceList::removeAt(int index)
-{
-    if (m_modelState == IdleState) {
-        beginRemoveRows(QModelIndex(), index, index);
-        m_modelState = RemovingState;
-    } else {
-        Q_ASSERT(m_modelState == ResettingState);
-        // No point in signaling anything if we're resetting the whole model
-    }
-
-    m_surfaceList.removeAt(index);
-
-    if (m_modelState == RemovingState) {
-        endRemoveRows();
-        Q_EMIT countChanged();
-        Q_EMIT listChanged();
-        m_modelState = IdleState;
-    }
-
-    DEBUG_MSG << " after " << toString();
-}
-
-int TopLevelSurfaceList::indexOf(MirSurfaceInterface *surface)
-{
-    for (int i = 0; i < m_surfaceList.count(); ++i) {
-        if (m_surfaceList.at(i).surface == surface) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-void TopLevelSurfaceList::move(int from, int to)
-{
-    if (from == to) return;
-    DEBUG_MSG << " from=" << from << " to=" << to;
-
-    if (from >= 0 && from < m_surfaceList.size() && to >= 0 && to < m_surfaceList.size()) {
-        QModelIndex parent;
-        /* When moving an item down, the destination index needs to be incremented
-           by one, as explained in the documentation:
-           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
-
-        Q_ASSERT(m_modelState == IdleState);
-        m_modelState = MovingState;
-
-        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
-        m_surfaceList.move(from, to);
-        endMoveRows();
-        Q_EMIT listChanged();
-
-        m_modelState = IdleState;
-
-        DEBUG_MSG << " after " << toString();
-    }
-}
-
-MirSurfaceInterface *TopLevelSurfaceList::surfaceAt(int index) const
-{
-    if (index >=0 && index < m_surfaceList.count()) {
-        return m_surfaceList[index].surface;
-    } else {
-        return nullptr;
-    }
-}
-
-ApplicationInfoInterface *TopLevelSurfaceList::applicationAt(int index) const
-{
-    if (index >=0 && index < m_surfaceList.count()) {
-        return m_surfaceList[index].application;
-    } else {
-        return nullptr;
-    }
-}
-
-int TopLevelSurfaceList::idAt(int index) const
-{
-    if (index >=0 && index < m_surfaceList.count()) {
-        return m_surfaceList[index].id;
-    } else {
-        return 0;
-    }
-}
-
-int TopLevelSurfaceList::indexForId(int id) const
-{
-    for (int i = 0; i < m_surfaceList.count(); ++i) {
-        if (m_surfaceList[i].id == id) {
-            return i;
-        }
-    }
-    return -1;
-}
-
-void TopLevelSurfaceList::doRaiseId(int id)
-{
-    int fromIndex = indexForId(id);
-    if (fromIndex != -1) {
-        move(fromIndex, 0 /* toIndex */);
-    }
-}
-
-void TopLevelSurfaceList::raiseId(int id)
-{
-    if (m_modelState == IdleState) {
-        DEBUG_MSG << "(id=" << id << ") - do it now.";
-        doRaiseId(id);
-    } else {
-        DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
-        // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
-        // if we perform yet another model change straight away.
-        //
-        // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
-        // the index is definitely within bounds.
-        QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
-    }
-}
-
-int TopLevelSurfaceList::generateId()
-{
-    int id = m_nextId;
-    m_nextId = nextFreeId(m_nextId + 1);
-    Q_EMIT nextIdChanged();
-    return id;
-}
-
-int TopLevelSurfaceList::nextFreeId(int candidateId)
-{
-    if (candidateId > m_maxId) {
-        return nextFreeId(1);
-    } else {
-        if (indexForId(candidateId) == -1) {
-            // it's indeed free
-            return candidateId;
-        } else {
-            return nextFreeId(candidateId + 1);
-        }
-    }
-}
-
-QString TopLevelSurfaceList::toString()
-{
-    QString str;
-    for (int i = 0; i < m_surfaceList.count(); ++i) {
-        auto item = m_surfaceList.at(i);
-
-        QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
-            .arg(i)
-            .arg(item.application->appId())
-            .arg((qintptr)item.surface, 0, 16)
-            .arg(item.id);
-
-        if (i > 0) {
-            str.append(",");
-        }
-        str.append(itemStr);
-    }
-    return str;
-}
-
-void TopLevelSurfaceList::addApplication(ApplicationInfoInterface *application)
-{
-    DEBUG_MSG << "(" << application->appId() << ")";
-    Q_ASSERT(!m_applications.contains(application));
-    m_applications.append(application);
-
-    MirSurfaceListInterface *surfaceList = application->surfaceList();
-
-    if (application->state() != ApplicationInfoInterface::Stopped) {
-        if (surfaceList->count() == 0) {
-            appendPlaceholder(application);
-        } else {
-            for (int i = 0; i < surfaceList->count(); ++i) {
-                appendSurface(surfaceList->get(i), application);
-            }
-        }
-    }
-
-    connect(surfaceList, &QAbstractItemModel::rowsInserted, this,
-            [this, application, surfaceList](const QModelIndex & /*parent*/, int first, int last)
-            {
-                for (int i = last; i >= first; --i) {
-                    this->appendSurface(surfaceList->get(i), application);
-                }
-            });
-}
-
-void TopLevelSurfaceList::removeApplication(ApplicationInfoInterface *application)
-{
-    DEBUG_MSG << "(" << application->appId() << ")";
-    Q_ASSERT(m_applications.contains(application));
-
-    MirSurfaceListInterface *surfaceList = application->surfaceList();
-
-    disconnect(surfaceList, 0, this, 0);
-
-    Q_ASSERT(m_modelState == IdleState);
-    m_modelState = RemovingState;
-
-    int i = 0;
-    while (i < m_surfaceList.count()) {
-        if (m_surfaceList.at(i).application == application) {
-            beginRemoveRows(QModelIndex(), i, i);
-            m_surfaceList.removeAt(i);
-            endRemoveRows();
-            Q_EMIT countChanged();
-            Q_EMIT listChanged();
-        } else {
-            ++i;
-        }
-    }
-
-    m_modelState = IdleState;
-
-    DEBUG_MSG << " after " << toString();
-
-    m_applications.removeAll(application);
-}
-
-QAbstractListModel *TopLevelSurfaceList::applicationsModel() const
-{
-    return m_applicationsModel;
-}
-
-void TopLevelSurfaceList::setApplicationsModel(QAbstractListModel* value)
-{
-    if (m_applicationsModel == value) {
-        return;
-    }
-
-    DEBUG_MSG << "(" << value << ")";
-
-    Q_ASSERT(m_modelState == IdleState);
-    m_modelState = ResettingState;
-
-    beginResetModel();
-
-    if (m_applicationsModel) {
-        m_surfaceList.clear();
-        m_applications.clear();
-        disconnect(m_applicationsModel, 0, this, 0);
-    }
-
-    m_applicationsModel = value;
-
-    if (m_applicationsModel) {
-        findApplicationRole();
-
-        connect(m_applicationsModel, &QAbstractItemModel::rowsInserted,
-                this, [this](const QModelIndex &/*parent*/, int first, int last) {
-                    for (int i = first; i <= last; ++i) {
-                        auto application = getApplicationFromModelAt(i);
-                        addApplication(application);
-                    }
-                });
-
-        connect(m_applicationsModel, &QAbstractItemModel::rowsAboutToBeRemoved,
-                this, [this](const QModelIndex &/*parent*/, int first, int last) {
-                    for (int i = first; i <= last; ++i) {
-                        auto application = getApplicationFromModelAt(i);
-                        removeApplication(application);
-                    }
-                });
-
-        for (int i = 0; i < m_applicationsModel->rowCount(); ++i) {
-            auto application = getApplicationFromModelAt(i);
-            addApplication(application);
-        }
-    }
-
-    endResetModel();
-    m_modelState = IdleState;
-}
-
-ApplicationInfoInterface *TopLevelSurfaceList::getApplicationFromModelAt(int index)
-{
-    QModelIndex modelIndex = m_applicationsModel->index(index);
-
-    QVariant variant =  m_applicationsModel->data(modelIndex, m_applicationRole);
-
-    // variant.value<ApplicationInfoInterface*>() returns null for some reason.
-    return static_cast<ApplicationInfoInterface*>(variant.value<QObject*>());
-}
-
-void TopLevelSurfaceList::findApplicationRole()
-{
-    QHash<int, QByteArray> namesHash = m_applicationsModel->roleNames();
-
-    m_applicationRole = -1;
-    for (auto i = namesHash.begin(); i != namesHash.end() && m_applicationRole == -1; ++i) {
-        if (i.value() == "application") {
-            m_applicationRole = i.key();
-        }
-    }
-
-    if (m_applicationRole == -1) {
-        qFatal("TopLevelSurfaceList: applicationsModel must have a \"application\" role.");
-    }
-}

=== removed file 'plugins/WindowManager/TopLevelSurfaceList.h'
--- plugins/WindowManager/TopLevelSurfaceList.h	2016-04-04 13:39:44 +0000
+++ plugins/WindowManager/TopLevelSurfaceList.h	1970-01-01 00:00:00 +0000
@@ -1,223 +0,0 @@
-/*
- * 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 TOPLEVELSURFACELIST_H
-#define TOPLEVELSURFACELIST_H
-
-#include <QAbstractListModel>
-#include <QList>
-#include <QLoggingCategory>
-
-Q_DECLARE_LOGGING_CATEGORY(UNITY_TOPSURFACELIST)
-
-namespace unity {
-    namespace shell {
-        namespace application {
-            class ApplicationInfoInterface;
-            class MirSurfaceInterface;
-        }
-    }
-}
-
-/**
- * @brief A model of top-level surfaces
- *
- * It's an abstraction of top-level application windows.
- *
- * When an entry first appears, it normaly doesn't have a surface yet, meaning that the application is
- * still starting up. A shell should then display a splash screen or saved screenshot of the application
- * until its surface comes up.
- *
- * As applications can have multiple surfaces and you can also have entries without surfaces at all,
- * the only way to unambiguously refer to an entry in this model is through its id.
- */
-class TopLevelSurfaceList : public QAbstractListModel
-{
-
-    Q_OBJECT
-
-    /**
-     * @brief A list model of applications.
-     *
-     * It's expected to have a role called "application" which returns a ApplicationInfoInterface
-     */
-    Q_PROPERTY(QAbstractListModel* applicationsModel READ applicationsModel
-                                                     WRITE setApplicationsModel
-                                                     NOTIFY applicationsModelChanged)
-
-    /**
-     * @brief Number of top-level surfaces in this model
-     *
-     * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
-     */
-    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
-
-    /**
-      The id to be used on the next entry created
-      Useful for tests
-     */
-    Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)
-public:
-
-    /**
-     * @brief The Roles supported by the model
-     *
-     * SurfaceRole - A MirSurfaceInterface. It will be null if the application is still starting up
-     * ApplicationRole - An ApplicationInfoInterface
-     * IdRole - A unique identifier for this entry. Useful to unambiguosly track elements as they move around in the list
-     */
-    enum Roles {
-        SurfaceRole = Qt::UserRole,
-        ApplicationRole = Qt::UserRole + 1,
-        IdRole = Qt::UserRole + 2,
-    };
-
-    explicit TopLevelSurfaceList(QObject *parent = nullptr);
-    virtual ~TopLevelSurfaceList();
-
-    // QAbstractItemModel methods
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    QVariant data(const QModelIndex& index, int role) const override;
-    QHash<int, QByteArray> roleNames() const override {
-        QHash<int, QByteArray> roleNames { {SurfaceRole, "surface"},
-                                           {ApplicationRole, "application"},
-                                           {IdRole, "id"} };
-        return roleNames;
-    }
-
-    int nextId() const { return m_nextId; }
-
-    QAbstractListModel *applicationsModel() const;
-    void setApplicationsModel(QAbstractListModel*);
-
-public Q_SLOTS:
-    /**
-     * @brief Returns the surface at the given index
-     *
-     * It will be a nullptr if the application is still starting up and thus hasn't yet created
-     * and drawn into a surface.
-     */
-    unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const;
-
-    /**
-     * @brief Returns the application at the given index
-     */
-    unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const;
-
-    /**
-     * @brief Returns the unique id of the element at the given index
-     */
-    int idAt(int index) const;
-
-    /**
-     * @brief Returns the index where the row with the given id is located
-     *
-     * Returns -1 if there's no row with the given id.
-     */
-    int indexForId(int id) const;
-
-    /**
-     * @brief Raises the row with the given id to index 0
-     */
-    void raiseId(int id);
-
-    void doRaiseId(int id);
-
-Q_SIGNALS:
-    void countChanged();
-
-    /**
-     * @brief Emitted when the list changes
-     *
-     * Emitted when model gains an element, loses an element or when elements exchange positions.
-     */
-    void listChanged();
-
-    void nextIdChanged();
-
-    void applicationsModelChanged();
-
-private:
-    void addApplication(unity::shell::application::ApplicationInfoInterface *application);
-    void removeApplication(unity::shell::application::ApplicationInfoInterface *application);
-
-    int indexOf(unity::shell::application::MirSurfaceInterface *surface);
-    void raise(unity::shell::application::MirSurfaceInterface *surface);
-    void move(int from, int to);
-    void appendSurfaceHelper(unity::shell::application::MirSurfaceInterface *surface,
-                              unity::shell::application::ApplicationInfoInterface *application);
-    void connectSurface(unity::shell::application::MirSurfaceInterface *surface);
-    int generateId();
-    int nextFreeId(int candidateId);
-    QString toString();
-    void onSurfaceDestroyed(unity::shell::application::MirSurfaceInterface *surface);
-    void onSurfaceDied(unity::shell::application::MirSurfaceInterface *surface);
-    void removeAt(int index);
-    void findApplicationRole();
-
-    unity::shell::application::ApplicationInfoInterface *getApplicationFromModelAt(int index);
-
-    /*
-        Placeholder for a future surface from a starting or running application.
-        Enables shell to give immediate feedback to the user by showing, eg,
-        a splash screen.
-
-        It's a model row containing a null surface and the given application.
-     */
-    void appendPlaceholder(unity::shell::application::ApplicationInfoInterface *application);
-
-    /*
-        Adds a model row with the given surface and application
-
-        Alternatively, if a placeholder exists for the given application it's
-        filled with the given surface instead.
-     */
-    void appendSurface(unity::shell::application::MirSurfaceInterface *surface,
-            unity::shell::application::ApplicationInfoInterface *application);
-
-    struct ModelEntry {
-        ModelEntry(unity::shell::application::MirSurfaceInterface *surface, unity::shell::application::ApplicationInfoInterface *application, int id)
-            : surface(surface), application(application), id(id) {}
-        unity::shell::application::MirSurfaceInterface *surface;
-        unity::shell::application::ApplicationInfoInterface *application;
-        int id;
-        bool removeOnceSurfaceDestroyed{false};
-    };
-
-    QList<ModelEntry> m_surfaceList;
-    int m_nextId{1};
-    static const int m_maxId{1000000};
-
-    // applications that are being monitored
-    QList<unity::shell::application::ApplicationInfoInterface *> m_applications;
-
-    QAbstractListModel* m_applicationsModel{nullptr};
-    int m_applicationRole{-1};
-
-    enum ModelState {
-        IdleState,
-        InsertingState,
-        RemovingState,
-        MovingState,
-        ResettingState
-    };
-    ModelState m_modelState{IdleState};
-};
-
-Q_DECLARE_METATYPE(TopLevelSurfaceList*)
-Q_DECLARE_METATYPE(QAbstractListModel*)
-
-#endif // TOPLEVELSURFACELIST_H

=== removed file 'plugins/WindowManager/WindowManagerPlugin.cpp'
--- plugins/WindowManager/WindowManagerPlugin.cpp	2016-04-04 13:37:49 +0000
+++ plugins/WindowManager/WindowManagerPlugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/*
- * 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 "WindowManagerPlugin.h"
-
-#include "TopLevelSurfaceList.h"
-
-#include <QtQml>
-
-void WindowManagerPlugin::registerTypes(const char *uri)
-{
-    qmlRegisterType<TopLevelSurfaceList>(uri, 0, 1, "TopLevelSurfaceList");
-
-    qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");
-}

=== removed file 'plugins/WindowManager/WindowManagerPlugin.h'
--- plugins/WindowManager/WindowManagerPlugin.h	2016-04-04 13:37:49 +0000
+++ plugins/WindowManager/WindowManagerPlugin.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * 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 WINDOWMANAGER_PLUGIN_H
-#define WINDOWMANAGER_PLUGIN_H
-
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlExtensionPlugin>
-
-class WindowManagerPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri) override;
-};
-
-#endif // WINDOWMANAGER_PLUGIN_H

=== removed file 'plugins/WindowManager/qmldir'
--- plugins/WindowManager/qmldir	2016-04-04 13:37:49 +0000
+++ plugins/WindowManager/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module WindowManager
-plugin windowmanager-qml

=== modified file 'qml/Components/InputMethod.qml'
--- qml/Components/InputMethod.qml	2016-10-06 13:06:31 +0000
+++ qml/Components/InputMethod.qml	2016-11-09 15:21:35 +0000
@@ -23,6 +23,8 @@
 
     readonly property rect visibleRect: surfaceItem.surface && visible ? surfaceItem.surface.inputBounds : Qt.rect(0, 0, 0, 0)
 
+    property var surface
+
     MirSurfaceItem {
         id: surfaceItem
         anchors.fill: parent
@@ -31,7 +33,7 @@
 
         surfaceWidth: root.enabled ? width : -1
         surfaceHeight: root.enabled ? height : -1
-        surface: SurfaceManager.inputMethodSurface
+        surface: root.surface
 
         onLiveChanged: {
             if (surface !== null && !live) {
@@ -50,7 +52,6 @@
     }
 
     visible: surfaceItem.surface &&
-              surfaceItem.surfaceState != Mir.HiddenState &&
-              surfaceItem.surfaceState != Mir.MinimizedState &&
-              root.enabled
+             surfaceItem.surface.visible &&
+             root.enabled
 }

=== modified file 'qml/Components/KeymapSwitcher.qml'
--- qml/Components/KeymapSwitcher.qml	2016-07-11 14:40:56 +0000
+++ qml/Components/KeymapSwitcher.qml	2016-11-09 15:21:35 +0000
@@ -23,6 +23,9 @@
 QtObject {
     id: root
 
+    // to be set from outside
+    property var focusedSurface: null
+
     property GlobalShortcut shortcutNext: GlobalShortcut {
         shortcut: Qt.MetaModifier|Qt.Key_Space
         onTriggered: root.nextKeymap()
@@ -60,7 +63,7 @@
     }
 
     property Binding surfaceKeymapBinding: Binding {
-        target: MirFocusController.focusedSurface
+        target: root.focusedSurface
         property: "keymap"
         value: root.currentKeymap
     }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-10-03 11:15:27 +0000
+++ qml/Shell.qml	2016-11-09 15:21:35 +0000
@@ -43,7 +43,6 @@
 import Unity.DashCommunicator 0.1
 import Unity.Indicators 0.1 as Indicators
 import Cursor 1.1
-import WindowManager 0.1
 
 
 StyledItem {
@@ -264,10 +263,9 @@
         width: parent.width
         height: parent.height
 
-        TopLevelSurfaceList {
+        TopLevelWindowModel {
             id: topLevelSurfaceList
             objectName: "topLevelSurfaceList"
-            applicationsModel: ApplicationManager
         }
 
         Stage {
@@ -320,6 +318,7 @@
     InputMethod {
         id: inputMethod
         objectName: "inputMethod"
+        surface: topLevelSurfaceList.inputMethodSurface
         anchors {
             fill: parent
             topMargin: panel.panelHeight
@@ -485,8 +484,8 @@
                 greeterShown: greeter.shown
             }
 
-            readonly property bool focusedSurfaceIsFullscreen: MirFocusController.focusedSurface
-                ? MirFocusController.focusedSurface.state === Mir.FullscreenState
+            readonly property bool focusedSurfaceIsFullscreen: topLevelSurfaceList.focusedWindow
+                ? topLevelSurfaceList.focusedWindow.state === Mir.FullscreenState
                 : false
             fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0)
                             || greeter.hasLockedApp
@@ -785,7 +784,9 @@
     }
 
     // non-visual object
-    KeymapSwitcher {}
+    KeymapSwitcher {
+        focusedSurface: topLevelSurfaceList.focusedWindow ? topLevelSurfaceList.focusedWindow.surface : null
+    }
 
     Rectangle {
         id: shutdownFadeOutRectangle

=== modified file 'qml/Stage/DecoratedWindow.qml'
--- qml/Stage/DecoratedWindow.qml	2016-10-07 11:20:09 +0000
+++ qml/Stage/DecoratedWindow.qml	2016-11-09 15:21:35 +0000
@@ -70,11 +70,13 @@
 
     readonly property Item clientAreaItem: applicationWindow
 
+    readonly property real contentX: applicationWindow.x
+    readonly property real contentY: applicationWindow.y
+
     signal closeClicked()
     signal maximizeClicked()
     signal maximizeHorizontallyClicked()
     signal maximizeVerticallyClicked()
-    signal minimizeClicked()
     signal decorationPressed()
     signal decorationReleased()
 
@@ -163,7 +165,11 @@
         onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
         onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
         onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
-        onMinimizeClicked: root.minimizeClicked();
+        onMinimizeClicked: {
+            if (applicationWindow.surface) {
+                applicationWindow.surface.requestState(Mir.MinimizedState);
+            }
+        }
         onPressed: root.decorationPressed();
 
         onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)

=== modified file 'qml/Stage/FakeMaximizeDelegate.qml'
--- qml/Stage/FakeMaximizeDelegate.qml	2016-09-13 11:53:40 +0000
+++ qml/Stage/FakeMaximizeDelegate.qml	2016-11-09 15:21:35 +0000
@@ -98,19 +98,19 @@
     function commit() {
         if (progress > hintThreshold && edge != -1) {
             if (edge == Item.Top) {
-                target.maximize();
+                target.requestMaximize();
             } else if (edge == Item.Left) {
-                target.maximizeLeft();
+                target.requestMaximizeLeft();
             } else if (edge == Item.Right) {
-                target.maximizeRight();
+                target.requestMaximizeRight();
             } else if (edge == Item.TopLeft) {
-                target.maximizeTopLeft();
+                target.requestMaximizeTopLeft();
             } else if (edge == Item.TopRight) {
-                target.maximizeTopRight();
+                target.requestMaximizeTopRight();
             } else if (edge == Item.BottomLeft) {
-                target.maximizeBottomLeft();
+                target.requestMaximizeBottomLeft();
             } else if (edge == Item.BottomRight) {
-                target.maximizeBottomRight();
+                target.requestMaximizeBottomRight();
             }
         } else {
             stop();

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2016-10-24 11:34:20 +0000
+++ qml/Stage/Stage.qml	2016-11-09 15:21:35 +0000
@@ -92,8 +92,7 @@
 
     onAltTabPressedChanged: priv.goneToSpread = altTabPressed
 
-    property Item itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
-                              priv.focusedAppDelegate.surface.confinesMousePointer ?
+    property Item itemConfiningMouseCursor: !spreadShown && priv.focusedAppDelegate && priv.focusedAppDelegate.window.confinesMousePointer ?
                               priv.focusedAppDelegate.clientAreaItem : null;
 
     signal itemSnapshotRequested(Item item)
@@ -152,29 +151,34 @@
     GlobalShortcut {
         id: maximizeWindowShortcut
         shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Up
-        onTriggered: priv.focusedAppDelegate.maximize()
+        onTriggered: priv.focusedAppDelegate.requestMaximize()
         active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximized
     }
 
     GlobalShortcut {
         id: maximizeWindowLeftShortcut
         shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Left
-        onTriggered: priv.focusedAppDelegate.maximizeLeft()
+        onTriggered: priv.focusedAppDelegate.requestMaximizeLeft()
         active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximizedLeftRight
     }
 
     GlobalShortcut {
         id: maximizeWindowRightShortcut
         shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Right
-        onTriggered: priv.focusedAppDelegate.maximizeRight()
+        onTriggered: priv.focusedAppDelegate.requestMaximizeRight()
         active: root.state == "windowed" && priv.focusedAppDelegate && priv.focusedAppDelegate.canBeMaximizedLeftRight
     }
 
     GlobalShortcut {
         id: minimizeRestoreShortcut
         shortcut: Qt.MetaModifier|Qt.ControlModifier|Qt.Key_Down
-        onTriggered: priv.focusedAppDelegate.anyMaximized
-                     ? priv.focusedAppDelegate.restoreFromMaximized() : priv.focusedAppDelegate.minimize()
+        onTriggered: {
+            if (priv.focusedAppDelegate.anyMaximized) {
+                priv.focusedAppDelegate.requestRestore();
+            } else {
+                priv.focusedAppDelegate.requestMinimize();
+            }
+        }
         active: root.state == "windowed" && priv.focusedAppDelegate
     }
 
@@ -210,20 +214,10 @@
         }
 
         function minimizeAllWindows() {
-            for (var i = 0; i < appRepeater.count; i++) {
-                var appDelegate = appRepeater.itemAt(i);
-                if (appDelegate && !appDelegate.minimized) {
-                    appDelegate.minimize();
-                }
-            }
-        }
-
-        function focusNext() {
-            for (var i = 0; i < appRepeater.count; i++) {
-                var appDelegate = appRepeater.itemAt(i);
-                if (appDelegate && !appDelegate.minimized) {
-                    appDelegate.focus = true;
-                    return;
+            for (var i = appRepeater.count - 1; i >= 0; i--) {
+                var appDelegate = appRepeater.itemAt(i);
+                if (appDelegate && !appDelegate.minimized) {
+                    appDelegate.requestMinimize();
                 }
             }
         }
@@ -251,7 +245,7 @@
                 priv.sideStageItemId = 0;
                 priv.sideStageAppId = "";
                 priv.mainStageDelegate = appRepeater.itemAt(0);
-                priv.mainStageAppId = topLevelSurfaceList.idAt(0);
+                priv.mainStageItemId = topLevelSurfaceList.idAt(0);
                 priv.mainStageAppId = topLevelSurfaceList.applicationAt(0) ? topLevelSurfaceList.applicationAt(0).appId : ""
                 return;
             }
@@ -318,8 +312,8 @@
     Connections {
         target: PanelState
         onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }
-        onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.minimize(); } }
-        onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.restoreFromMaximized(); } }
+        onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.requestMinimize(); } }
+        onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.requestRestore(); } }
     }
 
     Binding {
@@ -394,13 +388,6 @@
         }
     }
 
-    Binding {
-        target: MirFocusController
-        property: "focusedSurface"
-        value: priv.focusedAppDelegate ? priv.focusedAppDelegate.focusedSurface : null
-        when: !appRepeater.startingUp && root.parent
-    }
-
     states: [
         State {
             name: "spread"; when: priv.goneToSpread
@@ -567,7 +554,7 @@
 
             onShownChanged: {
                 if (!shown && priv.mainStageDelegate) {
-                    priv.mainStageDelegate.claimFocus();
+                    priv.mainStageDelegate.requestFocus();
                 }
             }
 
@@ -600,14 +587,23 @@
             }
         }
 
-        TopLevelSurfaceRepeater {
+        Repeater {
             id: appRepeater
             model: topLevelSurfaceList
             objectName: "appRepeater"
 
+            function indexOf(delegateItem) {
+                for (var i = 0; i < count; i++) {
+                    if (itemAt(i) === delegateItem) {
+                        return i;
+                    }
+                }
+                return -1;
+            }
+
             delegate: FocusScope {
                 id: appDelegate
-                objectName: "appDelegate_" + model.id
+                objectName: "appDelegate_" + model.window.id
                 property int itemIndex: index // We need this from outside the repeater
                 // z might be overriden in some cases by effects, but we need z ordering
                 // to calculate occlusion detection
@@ -619,11 +615,11 @@
                 }
                 z: normalZ
 
-                // Normally we want x/y where we request it to be. Width/height of our delegate will
+                // Normally we want x/y where the surface thinks it is. Width/height of our delegate will
                 // match what the actual surface size is.
                 // Don't write to those, they will be set by states
-                x: requestedX
-                y: requestedY
+                x: model.window.position.x - decoratedWindow.contentX
+                y: model.window.position.y - decoratedWindow.contentY
                 width: decoratedWindow.implicitWidth
                 height: decoratedWindow.implicitHeight
 
@@ -633,6 +629,12 @@
                 property real requestedY: windowedY
                 property real requestedWidth: windowedWidth
                 property real requestedHeight: windowedHeight
+                Binding {
+                    target: model.window; property: "requestedPosition"
+                    // miral doesn't know about our window decorations. So we have to deduct them
+                    value: Qt.point(appDelegate.requestedX + decoratedWindow.contentX,
+                                    appDelegate.requestedY + decoratedWindow.contentY)
+                }
 
                 // In those are for windowed mode. Those values basically store the window's properties
                 // when having a floating window. If you want to move/resize a window in normal mode, this is what you want to write to.
@@ -649,7 +651,7 @@
                 Binding {
                     target: appDelegate
                     property: "y"
-                    value: appDelegate.requestedY -
+                    value: model.window.position.y -
                            Math.min(appDelegate.requestedY - PanelState.panelHeight,
                                     Math.max(0, priv.virtualKeyboardHeight - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))
                     when: root.oskEnabled && appDelegate.focus && (appDelegate.state == "normal" || appDelegate.state == "restored")
@@ -705,7 +707,7 @@
                                                      maximizedTopLeft || maximizedTopRight || maximizedBottomLeft || maximizedBottomRight
 
                 readonly property bool minimized: windowState & WindowStateStorage.WindowStateMinimized
-                readonly property bool fullscreen: surface ? surface.state === Mir.FullscreenState : application.fullscreen
+                readonly property bool fullscreen: window.state === Mir.FullscreenState
 
                 readonly property bool canBeMaximized: canBeMaximizedHorizontally && canBeMaximizedVertically
                 readonly property bool canBeMaximizedLeftRight: (maximumWidth == 0 || maximumWidth >= appContainer.width/2) &&
@@ -731,7 +733,9 @@
                     priv.updateMainAndSideStageIndexes()
                 }
 
-                readonly property var surface: model.surface
+                readonly property var surface: model.window.surface
+                readonly property var window: model.window
+
                 readonly property alias resizeArea: resizeArea
                 readonly property alias focusedSurface: decoratedWindow.focusedSurface
                 readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging
@@ -740,6 +744,19 @@
                 readonly property bool isDash: appId == "unity8-dash"
                 readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
 
+                function requestFocus() { model.window.requestFocus(); }
+                function requestMaximize() { model.window.requestState(Mir.MaximizedState); }
+                function requestMaximizeVertically() { model.window.requestState(Mir.VertMaximizedState); }
+                function requestMaximizeHorizontally() { model.window.requestState(Mir.HorizMaximizedState); }
+                function requestMaximizeLeft() { model.window.requestState(Mir.MaximizedLeftState); }
+                function requestMaximizeRight() { model.window.requestState(Mir.MaximizedRightState); }
+                function requestMaximizeTopLeft() { model.window.requestState(Mir.MaximizedTopLeftState); }
+                function requestMaximizeTopRight() { model.window.requestState(Mir.MaximizedTopRightState); }
+                function requestMaximizeBottomLeft() { model.window.requestState(Mir.MaximizedBottomLeftState); }
+                function requestMaximizeBottomRight() { model.window.requestState(Mir.MaximizedBottomRightState); }
+                function requestMinimize() { model.window.requestState(Mir.MinimizedState); }
+                function requestRestore() { model.window.requestState(Mir.RestoredState); }
+
                 function claimFocus() {
                     if (root.state == "spread") {
                         spreadItem.highlightedIndex = index
@@ -751,45 +768,63 @@
                         }
                         priv.updateMainAndSideStageIndexes();
                     }
-
                     if (root.mode == "windowed") {
                         appDelegate.restore(true /* animated */, appDelegate.windowState);
-                    } else {
-                        appDelegate.focus = true;
                     }
+                    appDelegate.focus = true;
                 }
-                Connections {
-                    target: model.surface
-                    onFocusRequested: {
+
+                function updateQmlFocusFromMirSurfaceFocus() {
+                    if (model.window.focused) {
                         claimFocus();
+                        priv.focusedAppDelegate = appDelegate;
+                    //} else if (priv.focusedAppDelegate === appDelegate && root.state != "spread") {
+                    //    priv.focusedAppDelegate = null;
                     }
                 }
+
                 Connections {
-                    target: model.application
+                    target: model.window
+                    onFocusedChanged: {
+                        updateQmlFocusFromMirSurfaceFocus();
+                    }
                     onFocusRequested: {
-                        if (!model.surface) {
-                            // when an app has no surfaces, we assume there's only one entry representing it:
-                            // this delegate.
+                        if (model.window.focused && priv.focusedAppDelegate === appDelegate) {
+                            // it's already properly focused. Just ensure we show it on foreground
                             claimFocus();
-                        } else {
-                            // if the application has surfaces, focus request should be at surface-level.
-                        }
-                    }
-                }
-
-                onFocusChanged: {
-                    if (appRepeater.startingUp)
-                        return;
-
-                    if (focus) {
-                        topLevelSurfaceList.raiseId(model.id);
-                        priv.focusedAppDelegate = appDelegate;
-                    } else if (!focus && priv.focusedAppDelegate === appDelegate && root.state != "spread") {
-                        priv.focusedAppDelegate = null;
-                        // FIXME: No idea why the Binding{} doens't update when focusedAppDelegate turns null
-                        MirFocusController.focusedSurface = null;
-                    }
-                }
+                        }
+                    }
+                    onStateChanged: {
+                        if (model.window.state === Mir.MinimizedState) {
+                            appDelegate.minimize();
+                        } else if (model.window.state === Mir.MaximizedState) {
+                            appDelegate.maximize();
+                        } else if (model.window.state === Mir.VertMaximizedState) {
+                            appDelegate.maximizeVertically();
+                        } else if (model.window.state === Mir.HorizMaximizedState) {
+                            appDelegate.maximizeHorizontally();
+                        } else if (model.window.state === Mir.MaximizedLeftState) {
+                            appDelegate.maximizeLeft();
+                        } else if (model.window.state === Mir.MaximizedRightState) {
+                            appDelegate.maximizeRight();
+                        } else if (model.window.state === Mir.MaximizedTopLeftState) {
+                            appDelegate.maximizeTopLeft();
+                        } else if (model.window.state === Mir.MaximizedTopRightState) {
+                            appDelegate.maximizeTopRight();
+                        } else if (model.window.state === Mir.MaximizedBottomLeftState) {
+                            appDelegate.maximizeBottomLeft();
+                        } else if (model.window.state === Mir.MaximizedBottomRightState) {
+                            appDelegate.maximizeBottomRight();
+                        } else if (model.window.state === Mir.RestoredState) {
+                            if (appDelegate.anyMaximized) {
+                                appDelegate.restoreFromMaximized()
+                            } else {
+                                appDelegate.restore();
+                            }
+                        }
+                    }
+                }
+
                 Component.onCompleted: {
                     if (application && application.rotatesWindowContents) {
                         decoratedWindow.surfaceOrientationAngle = shellOrientationAngle;
@@ -803,16 +838,7 @@
                     // Now load any saved state. This needs to happen *after* the cascading!
                     resizeArea.loadWindowState();
 
-                    // NB: We're differentiating if this delegate was created in response to a new entry in the model
-                    //     or if the Repeater is just populating itself with delegates to match the model it received.
-                    if (!appRepeater.startingUp) {
-                        // a top level window is always the focused one when it first appears, unfocusing
-                        // any preexisting one
-                        if (root.state == "spread") {
-                            spreadItem.highlightedIndex = index;
-                        }
-                        claimFocus();
-                    }
+                    updateQmlFocusFromMirSurfaceFocus();
 
                     refreshStage();
                     _constructing = false;
@@ -827,16 +853,6 @@
                         priv.updateForegroundMaximizedApp();
                     }
 
-                    if (focus) {
-                        // focus some other window
-                        for (var i = 0; i < appRepeater.count; i++) {
-                            var appDelegate = appRepeater.itemAt(i);
-                            if (appDelegate && !appDelegate.minimized && i != index) {
-                                appDelegate.focus = true;
-                                return;
-                            }
-                        }
-                    }
                 }
 
                 onVisuallyMaximizedChanged: priv.updateForegroundMaximizedApp()
@@ -857,7 +873,7 @@
                          || focusAnimation.running || rightEdgeFocusAnimation.running || hidingAnimation.running
 
                 function close() {
-                    model.surface.close();
+                    model.window.close();
                 }
 
                 function maximize(animated) {
@@ -908,7 +924,6 @@
                     animationsEnabled = (animated === undefined) || animated;
                     windowState = state || WindowStateStorage.WindowStateRestored;
                     windowState &= ~WindowStateStorage.WindowStateMinimized; // clear the minimized bit
-                    focus = true;
                 }
 
                 function playFocusAnimation() {
@@ -922,7 +937,7 @@
                             rightEdgeFocusAnimation.start()
                         }
                     } else if (state == "windowedRightEdge" || state == "windowed") {
-                        claimFocus();
+                        requestFocus();
                     } else {
                         focusAnimation.start()
                     }
@@ -960,10 +975,10 @@
                     to: 1
                     duration: UbuntuAnimation.SnapDuration
                     onStarted: {
-                        topLevelSurfaceList.raiseId(model.id);
+                        topLevelSurfaceList.raiseId(model.window.id);
                     }
                     onStopped: {
-                        appDelegate.claimFocus();
+                        appDelegate.requestFocus();
                     }
                 }
                 ParallelAnimation {
@@ -973,7 +988,7 @@
                     UbuntuNumberAnimation { target: decoratedWindow; properties: "angle"; to: 0; duration: priv.animationDuration }
                     UbuntuNumberAnimation { target: decoratedWindow; properties: "itemScale"; to: 1; duration: priv.animationDuration }
                     onStopped: {
-                        appDelegate.focus = true
+                        appDelegate.requestFocus();
                     }
                 }
                 ParallelAnimation {
@@ -1333,14 +1348,6 @@
                         SequentialAnimation {
                             UbuntuNumberAnimation { target: appDelegate; properties: "requestedX,requestedY,opacity,scale,requestedWidth,requestedHeight" }
                             PropertyAction { target: appDelegate; property: "visuallyMinimized" }
-                            ScriptAction {
-                                script: {
-                                    if (appDelegate.minimized) {
-                                        appDelegate.focus = false;
-                                        priv.focusNext();
-                                    }
-                                }
-                            }
                         }
                     },
                     Transition {
@@ -1430,7 +1437,7 @@
                     visible: enabled
 
                     onPressed: {
-                        appDelegate.focus = true;
+                        appDelegate.requestFocus();
                     }
 
                     Component.onDestruction: {
@@ -1444,7 +1451,7 @@
                     anchors.left: appDelegate.left
                     anchors.top: appDelegate.top
                     application: model.application
-                    surface: model.surface
+                    surface: model.window.surface
                     active: appDelegate.focus
                     focus: true
                     interactive: root.interactive
@@ -1467,11 +1474,20 @@
                     onRequestedHeightChanged: oldRequestedHeight = requestedHeight
 
                     onCloseClicked: { appDelegate.close(); }
-                    onMaximizeClicked: appDelegate.anyMaximized ? appDelegate.restoreFromMaximized() : appDelegate.maximize();
-                    onMaximizeHorizontallyClicked: appDelegate.maximizedHorizontally ? appDelegate.restoreFromMaximized() : appDelegate.maximizeHorizontally()
-                    onMaximizeVerticallyClicked: appDelegate.maximizedVertically ? appDelegate.restoreFromMaximized() : appDelegate.maximizeVertically()
-                    onMinimizeClicked: appDelegate.minimize()
-                    onDecorationPressed: { appDelegate.focus = true; }
+                    onMaximizeClicked: appDelegate.anyMaximized ? appDelegate.requestRestore() : appDelegate.requestMaximize();
+                    onMaximizeHorizontallyClicked: {
+                        if (appDelegate.maximizedHorizontally)
+                            appDelegate.requestRestore();
+                        else
+                            appDelegate.requestMaximizeHorizontally();
+                    }
+                    onMaximizeVerticallyClicked: {
+                        if (appDelegate.maximizedVertically)
+                            appDelegate.requestRestore();
+                        else
+                            appDelegate.requestMaximizeVertically();
+                    }
+                    onDecorationPressed: { appDelegate.requestFocus(); }
                     onDecorationReleased: fakeRectangle.commit();
 
                     property real angle: 0
@@ -1518,12 +1534,12 @@
                 WindowedFullscreenPolicy {
                     id: windowedFullscreenPolicy
                     active: root.mode == "windowed"
-                    surface: model.surface
+                    surface: model.window.surface
                 }
                 StagedFullscreenPolicy {
                     id: stagedFullscreenPolicy
                     active: root.mode == "staged" || root.mode == "stagedWithSideStage"
-                    surface: model.surface
+                    surface: model.window.surface
                 }
 
                 SpreadDelegateInputArea {
@@ -1536,16 +1552,13 @@
                     onClicked: {
                         spreadItem.highlightedIndex = index;
                         if (distance == 0) {
+                            model.window.requestFocus();
                             priv.goneToSpread = false;
                         }
                     }
                     onClose: {
                         priv.closingIndex = index
-                        if (model.surface) { // could be stopped by OOM
-                            model.surface.close()
-                        } else if (model.application) {
-                            root.applicationManager.stopApplication(model.application.appId);
-                        }
+                        model.window.close();
                     }
                 }
 

=== modified file 'qml/Stage/StagedFullscreenPolicy.qml'
--- qml/Stage/StagedFullscreenPolicy.qml	2016-04-04 13:41:19 +0000
+++ qml/Stage/StagedFullscreenPolicy.qml	2016-11-09 15:21:35 +0000
@@ -32,7 +32,7 @@
     onSurfaceChanged: {
         if (!active || !surface) return;
         if (surface.shellChrome === Mir.LowChrome) {
-            surface.state = Mir.FullscreenState;
+            surface.requestState(Mir.FullscreenState);
         }
     }
 
@@ -41,15 +41,15 @@
         onShellChromeChanged: {
             if (!active || !surface) return;
             if (surface.shellChrome === Mir.LowChrome) {
-                surface.state = Mir.FullscreenState;
+                surface.requestState(Mir.FullscreenState);
             } else {
-                surface.state = Mir.RestoredState;
+                surface.requestState(Mir.RestoredState);
             }
         }
         onStateChanged: {
             if (!active) return;
             if (surface.state === Mir.RestoredState && surface.shellChrome === Mir.LowChrome) {
-                surface.state = Mir.FullscreenState;
+                surface.requestState(Mir.FullscreenState);
             }
         }
     }

=== removed file 'qml/Stage/TopLevelSurfaceRepeater.qml'
--- qml/Stage/TopLevelSurfaceRepeater.qml	2016-09-12 17:05:43 +0000
+++ qml/Stage/TopLevelSurfaceRepeater.qml	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * 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/>.
- */
-
-import QtQuick 2.4
-
-Repeater {
-    id: root
-    // FIXME: This is a hack around us not knowing whether the Repeater has finished creating its
-    // delegates on start up.
-    // This is a problem when the stage gets a TopLevelSurfaceList already populated with several
-    // rows.
-    property bool startingUp: true
-    onStartingUpChanged: {
-        if (!startingUp) {
-            // the top-most surface must be the focused one.
-            var topmostDelegate = itemAt(0);
-            if (topmostDelegate.focus) {
-                // Delegate got focused while we were still starting up. Not good.
-                // Force signal handler to run again
-                topmostDelegate.onFocusChanged(true);
-            } else {
-                topmostDelegate.focus = true;
-            }
-        }
-    }
-
-    onItemAdded: {
-        if (startingUp) {
-            checkIfStillStartingUp();
-        }
-    }
-
-    function checkIfStillStartingUp() {
-        var i = 0;
-        var missingDelegate = false;
-        for (i = 0; i < model.count && !missingDelegate; ++i) {
-            if (!itemAt(i)) {
-                missingDelegate = true;
-            }
-        }
-        if (!missingDelegate) {
-            startingUp = false;
-        }
-    }
-
-    function indexOf(delegateItem) {
-        for (var i = 0; i < count; i++) {
-            if (itemAt(i) === delegateItem) {
-                return i;
-            }
-        }
-        return -1;
-    }
-}

=== modified file 'qml/Stage/WindowedFullscreenPolicy.qml'
--- qml/Stage/WindowedFullscreenPolicy.qml	2016-04-04 13:37:49 +0000
+++ qml/Stage/WindowedFullscreenPolicy.qml	2016-11-09 15:21:35 +0000
@@ -33,7 +33,7 @@
         _firstTimeSurface = false;
 
         if (surface.state === Mir.FullscreenState && surface.shellChrome === Mir.LowChrome) {
-            surface.state = Mir.RestoredState;
+            surface.requestState(Mir.RestoredState);
         }
     }
 }

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-09-12 17:05:43 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-11-09 15:21:35 +0000
@@ -90,14 +90,17 @@
         return;
     }
 
+    bool wasFocused = focused();
+
     auto surface = surfaceManager->createSurface(surfaceName,
            Mir::NormalType,
-           fullscreen() ? Mir::FullscreenState : Mir::MaximizedState,
-           m_screenshotFileName);
+           fullscreen() ? Mir::FullscreenState : Mir::RestoredState,
+           m_screenshotFileName,
+           this);
 
     surface->setShellChrome(m_shellChrome);
 
-    m_surfaceList->appendSurface(surface);
+    m_surfaceList->addSurface(surface);
 
     ++m_liveSurfaceCount;
     connect(surface, &MirSurface::liveChanged, this, [this, surface](){
@@ -125,8 +128,19 @@
             setState(Running);
         }
     });
+    connect(surface, &MirSurfaceInterface::focusedChanged, this, [&](bool /*value*/) {
+        #if APPLICATION_DEBUG
+        qDebug().nospace() << "Application[" << appId() << "].focusedChanged(" << focused() << ")";
+        #endif
+        Q_EMIT focusedChanged(focused());
+    });
+
     connect(surface, &MirSurface::focusRequested, this, &ApplicationInfo::focusRequested);
 
+    if (wasFocused != focused()) {
+        Q_EMIT focusedChanged(focused());
+    }
+
     if (m_state == Starting) {
         if (m_requestedState == RequestedRunning) {
             setState(Running);
@@ -218,7 +232,7 @@
 {
     m_fullscreen = value;
     if (m_surfaceList->rowCount() > 0) {
-        m_surfaceList->get(0)->setState(Mir::FullscreenState);
+        m_surfaceList->get(0)->requestState(Mir::FullscreenState);
     }
 }
 

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2016-08-23 12:04:11 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2016-11-09 15:21:35 +0000
@@ -40,10 +40,14 @@
 
 namespace unityapi = unity::shell::application;
 
+
 ApplicationManager::ApplicationManager(QObject *parent)
     : ApplicationManagerInterface(parent)
 {
     DEBUG_MSG("");
+
+    ApplicationManagerNotifier::instance()->setApplicationManager(this);
+
     buildListOfAvailableApplications();
 
     // polling to find out when the toplevel window has been created as there's
@@ -53,11 +57,6 @@
     m_windowCreatedTimer.setSingleShot(false);
     m_windowCreatedTimer.start(200);
 
-    Q_ASSERT(MirFocusController::instance());
-    connect(MirFocusController::instance(), &MirFocusController::focusedSurfaceChanged,
-        this, &ApplicationManager::updateFocusedApplication, Qt::QueuedConnection);
-
-
     // Emit signal to notify Upstart that Mir is ready to receive client connections
     // see http://upstart.ubuntu.com/cookbook/#expect-stop
     // We do this because some autopilot tests actually use this mock Unity.Application module,
@@ -69,6 +68,7 @@
 
 ApplicationManager::~ApplicationManager()
 {
+    ApplicationManagerNotifier::instance()->setApplicationManager(nullptr);
 }
 
 void ApplicationManager::onWindowCreatedTimerTimeout()
@@ -158,6 +158,10 @@
         QModelIndex appIndex = findIndex(application);
         if (!appIndex.isValid()) return;
         Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleFocused);
+        Q_EMIT focusedApplicationIdChanged();
+        if (application->focused()) {
+            raiseApp(application->appId());
+        }
     });
     connect(application, &ApplicationInfo::stateChanged, this, [application, this]() {
         QModelIndex appIndex = findIndex(application);
@@ -181,15 +185,40 @@
 
 void ApplicationManager::remove(ApplicationInfo *application) {
     int i = m_runningApplications.indexOf(application);
+    application->disconnect(this);
     if (i != -1) {
         DEBUG_MSG(application->appId());
+        Q_ASSERT(!m_modelBusy);
+        m_modelBusy = true;
         beginRemoveRows(QModelIndex(), i, i);
         m_runningApplications.removeAt(i);
         endRemoveRows();
+        m_modelBusy = false;
         Q_EMIT countChanged();
         if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
-    }
-    application->disconnect(this);
+        DEBUG_MSG(application->appId() << " after: " << qPrintable(toString()));
+    }
+}
+
+void ApplicationManager::raiseApp(const QString &appId)
+{
+
+    int index = -1;
+    for (int i = 0; i < m_runningApplications.count() && index == -1; ++i) {
+        if (m_runningApplications[i]->appId() == appId) {
+            index = i;
+        }
+    }
+
+    if (index >= 0) {
+        if (m_modelBusy) {
+            DEBUG_MSG(appId << " - model busy. Try again later.");
+            QMetaObject::invokeMethod(this, "raiseApp", Qt::QueuedConnection, Q_ARG(QString, appId));
+        } else {
+            DEBUG_MSG(appId);
+            move(index, 0);
+        }
+    }
 }
 
 void ApplicationManager::move(int from, int to) {
@@ -197,12 +226,15 @@
 
     if (from >= 0 && from < m_runningApplications.size() && to >= 0 && to < m_runningApplications.size()) {
         QModelIndex parent;
+        Q_ASSERT(!m_modelBusy);
+        m_modelBusy = true;
         /* When moving an item down, the destination index needs to be incremented
          * by one, as explained in the documentation:
          * http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
         beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
         m_runningApplications.move(from, to);
         endMoveRows();
+        m_modelBusy = false;
     }
 }
 
@@ -473,40 +505,6 @@
     return m_runningApplications.isEmpty();
 }
 
-void ApplicationManager::updateFocusedApplication()
-{
-    ApplicationInfo *focusedApplication = nullptr;
-    ApplicationInfo *previouslyFocusedApplication = nullptr;
-
-    auto controller = MirFocusController::instance();
-    if (!controller) {
-        return;
-    }
-
-    MirSurface *surface = static_cast<MirSurface*>(controller->focusedSurface());
-    if (surface) {
-        focusedApplication = findApplication(surface);
-    }
-
-    surface = static_cast<MirSurface*>(controller->previouslyFocusedSurface());
-    if (surface) {
-        previouslyFocusedApplication = findApplication(surface);
-    }
-
-    if (focusedApplication != previouslyFocusedApplication) {
-        if (focusedApplication) {
-            DEBUG_MSG("focused " << focusedApplication->appId());
-            Q_EMIT focusedApplication->focusedChanged(true);
-            this->move(this->m_runningApplications.indexOf(focusedApplication), 0);
-        }
-        if (previouslyFocusedApplication) {
-            DEBUG_MSG("unfocused " << previouslyFocusedApplication->appId());
-            Q_EMIT previouslyFocusedApplication->focusedChanged(false);
-        }
-        Q_EMIT focusedApplicationIdChanged();
-    }
-}
-
 ApplicationInfo *ApplicationManager::findApplication(MirSurface* surface)
 {
     for (ApplicationInfo *app : m_runningApplications) {
@@ -517,3 +515,42 @@
     }
     return nullptr;
 }
+
+QString ApplicationManager::toString()
+{
+    QString str;
+    for (int i = 0; i < m_runningApplications.count(); ++i) {
+        auto *application = m_runningApplications.at(i);
+
+        QString itemStr = QString("(index=%1,appId=%2)")
+            .arg(i)
+            .arg(application->appId());
+
+        if (i > 0) {
+            str.append(",");
+        }
+        str.append(itemStr);
+    }
+    return str;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// ApplicationManagerNotifier
+
+ApplicationManagerNotifier *ApplicationManagerNotifier::m_instance = nullptr;
+
+ApplicationManagerNotifier *ApplicationManagerNotifier::instance()
+{
+    if (!m_instance) {
+        m_instance = new ApplicationManagerNotifier;
+    }
+    return m_instance;
+}
+
+void ApplicationManagerNotifier::setApplicationManager(ApplicationManager *appMan)
+{
+    if (appMan != m_applicationManager) {
+        m_applicationManager = appMan;
+        Q_EMIT applicationManagerChanged(m_applicationManager);
+    }
+}

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2016-04-27 15:01:10 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2016-11-09 15:21:35 +0000
@@ -77,17 +77,44 @@
 
  private Q_SLOTS:
     void onWindowCreatedTimerTimeout();
-    void updateFocusedApplication();
+    void raiseApp(const QString &appId);
 
  private:
     bool add(ApplicationInfo *application);
     void remove(ApplicationInfo* application);
     void buildListOfAvailableApplications();
     void onWindowCreated();
+    QString toString();
     ApplicationInfo *findApplication(MirSurface* surface);
     QList<ApplicationInfo*> m_runningApplications;
     QList<ApplicationInfo*> m_availableApplications;
     QTimer m_windowCreatedTimer;
+    bool m_modelBusy{false};
+};
+
+/*
+    Lifecycle of the ApplicationManager instance belongs to the QML plugin.
+    So this guy here is used to notify other parts of the system when the plugin creates and destroys
+    the ApplicationManager.
+
+    Unlike ApplicationManager, we create ApplicationManagerNotifier whenever we want.
+ */
+class ApplicationManagerNotifier : public QObject {
+    Q_OBJECT
+public:
+    static ApplicationManagerNotifier *instance();
+
+    ApplicationManager *applicationManager() { return m_applicationManager; }
+
+Q_SIGNALS:
+    void applicationManagerChanged(ApplicationManager *applicationManager);
+
+private:
+    void setApplicationManager(ApplicationManager *);
+    static ApplicationManagerNotifier *m_instance;
+    ApplicationManager *m_applicationManager{nullptr};
+
+friend class ApplicationManager;
 };
 
 Q_DECLARE_METATYPE(ApplicationManager*)

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2016-06-30 13:51:32 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2016-11-09 15:21:35 +0000
@@ -7,14 +7,17 @@
     MirSurfaceListModel.cpp
     ObjectListModel.h
     SurfaceManager.cpp
+    TopLevelWindowModel.cpp
     VirtualKeyboard.cpp
+    Window.cpp
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceItemInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
-    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirFocusControllerInterface.h
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/TopLevelWindowModelInterface.h
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/WindowInterface.h
     resources/surfaces.qrc
 )
 

=== modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
--- tests/mocks/Unity/Application/MirSurface.cpp	2016-09-26 12:25:19 +0000
+++ tests/mocks/Unity/Application/MirSurface.cpp	2016-11-09 15:21:35 +0000
@@ -26,7 +26,7 @@
 
 const char *stateToStr(Mir::State state)
 {
-    switch(state) {
+    switch (state) {
     case Mir::UnknownState:
         return "unknown";
     case Mir::RestoredState:
@@ -36,16 +36,28 @@
     case Mir::MaximizedState:
         return "maximized";
     case Mir::VertMaximizedState:
-        return "vert-maximized";
+        return "vertMaximized";
     case Mir::FullscreenState:
         return "fullscreen";
     case Mir::HorizMaximizedState:
-        return "horiz-maximized";
+        return "horizMaximized";
+    case Mir::MaximizedLeftState:
+        return "maximizedLeft";
+    case Mir::MaximizedRightState:
+        return "maximizedRight";
+    case Mir::MaximizedTopLeftState:
+        return "maximizedTopLeft";
+    case Mir::MaximizedTopRightState:
+        return "maximizedTopRight";
+    case Mir::MaximizedBottomLeftState:
+        return "maximizedBottomLeft";
+    case Mir::MaximizedBottomRightState:
+        return "maximizedBottomRight";
     case Mir::HiddenState:
         return "hidden";
     default:
         return "???";
-    };
+    }
 }
 
 #else
@@ -54,8 +66,6 @@
 
 using namespace unity::shell::application;
 
-MirFocusController *MirFocusController::m_instance = nullptr;
-
 MirSurface::MirSurface(const QString& name,
         Mir::Type type,
         Mir::State state,
@@ -69,7 +79,7 @@
     , m_screenshotUrl(screenshot)
     , m_qmlFilePath(qmlFilePath)
     , m_live(true)
-    , m_visible(true)
+    , m_focused(false)
     , m_activeFocus(false)
     , m_width(-1)
     , m_height(-1)
@@ -95,11 +105,8 @@
 {
     DEBUG_MSG("");
 
-    // controller instance might have been already destroyed by QQmlEngine destructor
-    auto controller = MirFocusController::instance();
-    if (controller && controller->focusedSurface() == this) {
-        controller->clear();
-    }
+    // Early warning, while MirSurface methods can still be accessed.
+    Q_EMIT destroyed(this);
 }
 
 QString MirSurface::name() const
@@ -122,14 +129,30 @@
     return m_state;
 }
 
+void MirSurface::requestState(Mir::State state)
+{
+    if (state == m_state) {
+        return;
+    }
+    DEBUG_MSG(stateToStr(state));
+    Q_EMIT stateRequested(state);
+}
+
 void MirSurface::setState(Mir::State state)
 {
-    if (state == m_state)
+    if (state == m_state) {
         return;
-
+    }
     DEBUG_MSG(stateToStr(state));
+
+    bool oldVisible = visible();
+
     m_state = state;
     Q_EMIT stateChanged(state);
+
+    if (visible() != oldVisible) {
+        Q_EMIT visibleChanged(visible());
+    }
 }
 
 bool MirSurface::live() const
@@ -139,7 +162,7 @@
 
 bool MirSurface::visible() const
 {
-    return m_visible;
+    return m_state != Mir::MinimizedState && m_state != Mir::HiddenState;
 }
 
 void MirSurface::setLive(bool live)
@@ -231,31 +254,30 @@
     if (!m_live && m_views.count() == 0) {
         deleteLater();
     }
-    updateVisibility();
+    updateExposure();
 }
 
-void MirSurface::setViewVisibility(qintptr viewId, bool visible)
+void MirSurface::setViewExposure(qintptr viewId, bool visible)
 {
     if (!m_views.contains(viewId)) return;
 
     m_views[viewId].visible = visible;
-    updateVisibility();
+    updateExposure();
 }
 
-void MirSurface::updateVisibility()
+void MirSurface::updateExposure()
 {
-    bool newVisible = false;
+    bool newExposure = false;
     QHashIterator<qintptr, View> i(m_views);
     while (i.hasNext()) {
         i.next();
-        newVisible |= i.value().visible;
+        newExposure |= i.value().visible;
     }
 
-    if (newVisible != visible()) {
-//        qDebug().nospace() << "MirSurface[" << name() << "]::updateVisibility(" << newVisible << ")";
-
-        m_visible = newVisible;
-        Q_EMIT visibleChanged(m_visible);
+    if (newExposure != m_exposed) {
+        m_exposed = newExposure;
+        DEBUG_MSG(m_exposed);
+        Q_EMIT exposedChanged(m_exposed);
         updateInputBoundsAfterResize();
     }
 }
@@ -273,6 +295,10 @@
     m_activeFocus = value;
 
     Q_EMIT activeFocusChanged(value);
+
+    if (m_activeFocus && !m_focused) {
+        requestFocus();
+    }
 }
 
 int MirSurface::width() const
@@ -431,27 +457,18 @@
 
 void MirSurface::setFocused(bool value)
 {
-    DEBUG_MSG(value);
-
-    auto controller = MirFocusController::instance();
-    // controller instance might have been already destroyed by QQmlEngine destructor
-    if (!controller) {
+    if (m_focused == value)
         return;
-    }
-
-    if (value) {
-        controller->setFocusedSurface(this);
-    } else if (controller->focusedSurface() == this) {
-        controller->setFocusedSurface(nullptr);
-    }
+
+    DEBUG_MSG("(" << value << ")");
+
+    m_focused = value;
+    Q_EMIT focusedChanged(value);
 }
 
 bool MirSurface::focused() const
 {
-    auto controller = MirFocusController::instance();
-
-    // controller instance might have been already destroyed by QQmlEngine destructor
-    return controller ? controller->focusedSurface() == this : false;
+    return m_focused;
 }
 
 QRect MirSurface::inputBounds() const
@@ -466,55 +483,15 @@
         Q_EMIT inputBoundsChanged(m_inputBounds);
     }
 }
-#if MIRSURFACE_DEBUG
-#undef DEBUG_MSG
-#define DEBUG_MSG(params) qDebug().nospace() << "MirFocusController::" << __func__  << " " << params
-#endif
-
-void MirFocusController::setFocusedSurface(MirSurfaceInterface *surface)
-{
-    if (m_focusedSurface == surface) {
-        return;
-    }
-    DEBUG_MSG("MirSurface[" << (void*)surface << "," << (surface?surface->name():"") << "]");
-
-    m_previouslyFocusedSurface = m_focusedSurface;
-    m_focusedSurface = surface;
-
-    if (m_previouslyFocusedSurface != m_focusedSurface) {
-        Q_EMIT focusedSurfaceChanged();
-    }
-
-    if (m_previouslyFocusedSurface) {
-        Q_EMIT m_previouslyFocusedSurface->focusedChanged(false);
-    }
-
-    if (m_focusedSurface) {
-        Q_EMIT m_focusedSurface->focusedChanged(true);
-        m_focusedSurface->raise();
-    }
-}
-
-MirFocusController* MirFocusController::instance()
-{
-    return m_instance;
-}
-
-MirFocusController::MirFocusController()
-{
-    DEBUG_MSG("");
-    Q_ASSERT(m_instance == nullptr);
-    m_instance = this;
-}
-
-MirFocusController::~MirFocusController()
-{
-    Q_ASSERT(m_instance == this);
-    m_instance = nullptr;
-}
-
-void MirFocusController::clear()
-{
-    m_focusedSurface = m_previouslyFocusedSurface = nullptr;
-    Q_EMIT focusedSurfaceChanged();
+
+void MirSurface::setRequestedPosition(const QPoint &value)
+{
+    if (value != m_requestedPosition) {
+        m_requestedPosition = value;
+        Q_EMIT requestedPositionChanged(value);
+
+        // fake-miral: always comply
+        m_position = m_requestedPosition;
+        Q_EMIT positionChanged(m_position);
+    }
 }

=== modified file 'tests/mocks/Unity/Application/MirSurface.h'
--- tests/mocks/Unity/Application/MirSurface.h	2016-09-07 08:50:19 +0000
+++ tests/mocks/Unity/Application/MirSurface.h	2016-11-09 15:21:35 +0000
@@ -23,31 +23,12 @@
 #include <QHash>
 
 // unity-api
-#include <unity/shell/application/MirFocusControllerInterface.h>
 #include <unity/shell/application/MirSurfaceInterface.h>
 
 #include "MirSurfaceListModel.h"
 
 class MirSurface;
 
-class MirFocusController : public unity::shell::application::MirFocusControllerInterface
-{
-    Q_OBJECT
-public:
-    MirFocusController();
-    virtual ~MirFocusController();
-    static MirFocusController* instance();
-
-    void setFocusedSurface(unity::shell::application::MirSurfaceInterface *surface) override;
-    unity::shell::application::MirSurfaceInterface* focusedSurface() const override { return m_focusedSurface; }
-    unity::shell::application::MirSurfaceInterface* previouslyFocusedSurface() { return m_previouslyFocusedSurface; }
-    void clear();
-private:
-    static MirFocusController *m_instance;
-    unity::shell::application::MirSurfaceInterface* m_previouslyFocusedSurface{nullptr};
-    unity::shell::application::MirSurfaceInterface* m_focusedSurface{nullptr};
-};
-
 class MirSurface : public unity::shell::application::MirSurfaceInterface
 {
     Q_OBJECT
@@ -58,6 +39,7 @@
     Q_PROPERTY(int height READ height NOTIFY heightChanged)
     Q_PROPERTY(bool activeFocus READ activeFocus NOTIFY activeFocusChanged)
     Q_PROPERTY(bool slowToResize READ isSlowToResize WRITE setSlowToResize NOTIFY slowToResizeChanged)
+    Q_PROPERTY(bool exposed READ exposed NOTIFY exposedChanged)
 
 public:
     MirSurface(const QString& name,
@@ -76,13 +58,14 @@
 
     QString persistentId() const override;
 
+    QPoint position() const override { return m_position; }
+
     QSize size() const override { return QSize(width(),height()); }
     void resize(int width, int height) override;
     void resize(const QSize &size) override { resize(size.width(), size.height()); }
 
 
     Mir::State state() const override;
-    Q_INVOKABLE void setState(Mir::State) override;
 
     bool live() const override;
 
@@ -108,6 +91,9 @@
 
     bool confinesMousePointer() const override { return false; }
 
+    QPoint requestedPosition() const override { return m_requestedPosition; }
+    void setRequestedPosition(const QPoint &) override;
+
     Q_INVOKABLE void requestFocus() override;
 
     Q_INVOKABLE void close() override;
@@ -126,6 +112,8 @@
     bool isSlowToResize() const;
     void setSlowToResize(bool value);
 
+    bool exposed() const { return m_exposed; }
+
     Q_INVOKABLE void setMinimumWidth(int);
     Q_INVOKABLE void setMaximumWidth(int);
     Q_INVOKABLE void setMinimumHeight(int);
@@ -148,17 +136,25 @@
 
     void registerView(qintptr viewId);
     void unregisterView(qintptr viewId);
-    void setViewVisibility(qintptr viewId, bool visible);
+    void setViewExposure(qintptr viewId, bool visible);
     int viewCount() const { return m_views.count(); }
 
     void setFocused(bool value);
 
+    void setState(Mir::State state);
+
+public Q_SLOTS:
+    ////
+    // unity.shell.application.MirSurface
+    void requestState(Mir::State) override;
+
 Q_SIGNALS:
     ////
     // API for tests
     void widthChanged();
     void heightChanged();
     void slowToResizeChanged();
+    void exposedChanged(bool exposed);
 
     ////
     // internal mock stuff
@@ -166,6 +162,7 @@
     void activeFocusChanged(bool);
     void raiseRequested();
     void closeRequested();
+    void stateRequested(Mir::State);
 
 protected:
     virtual void updateInputBoundsAfterResize();
@@ -175,7 +172,7 @@
 
 private:
     void doResize(int width, int height);
-    void updateVisibility();
+    void updateExposure();
 
     const QString m_name;
     const Mir::Type m_type;
@@ -185,7 +182,7 @@
     QUrl m_screenshotUrl;
     QUrl m_qmlFilePath;
     bool m_live;
-    bool m_visible;
+    bool m_focused;
     bool m_activeFocus;
     int m_width;
     int m_height;
@@ -210,10 +207,14 @@
         bool visible;
     };
     QHash<qintptr, View> m_views;
+    bool m_exposed{false};
 
     QTimer m_zombieTimer;
 
     QRect m_inputBounds;
+
+    QPoint m_position;
+    QPoint m_requestedPosition;
 };
 
 #endif // MOCK_MIR_SURFACE_H

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-08-23 11:11:32 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-11-09 15:21:35 +0000
@@ -59,7 +59,7 @@
         Qt::ExtraButton12 | Qt::ExtraButton13);
 
     connect(this, &QQuickItem::activeFocusChanged, this, &MirSurfaceItem::updateMirSurfaceActiveFocus);
-    connect(this, &QQuickItem::visibleChanged, this, &MirSurfaceItem::updateMirSurfaceVisibility);
+    connect(this, &QQuickItem::visibleChanged, this, &MirSurfaceItem::updateMirSurfaceExposure);
 
     connect(this, &MirSurfaceItem::consumesInputChanged, this, [this]() {
         updateMirSurfaceActiveFocus(hasActiveFocus());
@@ -278,7 +278,7 @@
         m_qmlSurface->registerView((qintptr)this);
 
         updateSurfaceSize();
-        updateMirSurfaceVisibility();
+        updateMirSurfaceExposure();
 
         if (m_orientationAngle) {
             m_qmlSurface->setOrientationAngle(*m_orientationAngle);
@@ -335,11 +335,11 @@
     }
 }
 
-void MirSurfaceItem::updateMirSurfaceVisibility()
+void MirSurfaceItem::updateMirSurfaceExposure()
 {
     if (!m_qmlSurface) return;
 
-    m_qmlSurface->setViewVisibility((qintptr)this, isVisible());
+    m_qmlSurface->setViewExposure((qintptr)this, isVisible());
 }
 
 void MirSurfaceItem::setConsumesInput(bool value)

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2016-06-22 13:53:00 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2016-11-09 15:21:35 +0000
@@ -50,7 +50,6 @@
     Mir::ShellChrome shellChrome() const override;
 
     Mir::State surfaceState() const override;
-    void setSurfaceState(Mir::State) override {}
 
     Mir::OrientationAngle orientationAngle() const override;
     void setOrientationAngle(Mir::OrientationAngle angle) override;
@@ -102,7 +101,7 @@
 private Q_SLOTS:
     void onComponentStatusChanged(QQmlComponent::Status status);
     void updateScreenshot(QUrl screenshot);
-    void updateMirSurfaceVisibility();
+    void updateMirSurfaceExposure();
     void updateMirSurfaceActiveFocus(bool focused);
 
 private:

=== modified file 'tests/mocks/Unity/Application/MirSurfaceListModel.cpp'
--- tests/mocks/Unity/Application/MirSurfaceListModel.cpp	2016-09-23 13:38:46 +0000
+++ tests/mocks/Unity/Application/MirSurfaceListModel.cpp	2016-11-09 15:21:35 +0000
@@ -21,8 +21,9 @@
 
 #define MIRSURFACELISTMODEL_DEBUG 0
 
-#ifdef MIRSURFACELISTMODEL_DEBUG
-#define DEBUG_MSG(params) qDebug().nospace() << "MirSurfaceListModel::" << __func__  << " " << params
+#if MIRSURFACELISTMODEL_DEBUG
+#include <QDebug>
+#define DEBUG_MSG(params) qDebug().nospace() << "MirSurfaceListModel::" << __func__  <<  params
 #else
 #define DEBUG_MSG(params) ((void)0)
 #endif
@@ -54,14 +55,25 @@
 
 void MirSurfaceListModel::raise(MirSurface *surface)
 {
+    DEBUG_MSG("(" << surface << ")");
     int i = m_surfaceList.indexOf(surface);
     if (i != -1) {
         moveSurface(i, 0);
     }
 }
 
+void MirSurfaceListModel::addSurface(MirSurface *surface)
+{
+    if (surface->focused()) {
+        prependSurface(surface);
+    } else {
+        appendSurface(surface);
+    }
+}
+
 void MirSurfaceListModel::appendSurface(MirSurface *surface)
 {
+    DEBUG_MSG("(" << surface << ")");
     beginInsertRows(QModelIndex(), m_surfaceList.size(), m_surfaceList.size());
     m_surfaceList.append(surface);
     connectSurface(surface);
@@ -74,6 +86,7 @@
 
 void MirSurfaceListModel::prependSurface(MirSurface *surface)
 {
+    DEBUG_MSG("(" << surface << ")");
     beginInsertRows(QModelIndex(), 0, 0);
     m_surfaceList.prepend(surface);
     connectSurface(surface);
@@ -85,6 +98,11 @@
 void MirSurfaceListModel::connectSurface(MirSurface *surface)
 {
     connect(surface, &QObject::destroyed, this, [this, surface](){ this->removeSurface(surface); });
+    connect(surface, &MirSurfaceInterface::focusedChanged, this, [this, surface](bool surfaceFocused){
+        if (surfaceFocused) {
+            raise(surface);
+        }
+    });
 }
 
 void MirSurfaceListModel::removeSurface(MirSurface *surface)

=== modified file 'tests/mocks/Unity/Application/MirSurfaceListModel.h'
--- tests/mocks/Unity/Application/MirSurfaceListModel.h	2016-06-02 12:02:35 +0000
+++ tests/mocks/Unity/Application/MirSurfaceListModel.h	2016-11-09 15:21:35 +0000
@@ -38,7 +38,7 @@
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex& index, int role) const override;
 
-    void appendSurface(MirSurface *surface);
+    void addSurface(MirSurface *surface);
     void removeSurface(MirSurface *surface);
 
     bool contains(MirSurface *surface) const { return m_surfaceList.contains(surface); }
@@ -49,6 +49,7 @@
     Q_INVOKABLE unity::shell::application::MirSurfaceInterface *createSurface();
 
 private:
+    void appendSurface(MirSurface *surface);
     void prependSurface(MirSurface *surface);
     void raise(MirSurface *surface);
     void moveSurface(int from, int to);

=== modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
--- tests/mocks/Unity/Application/SurfaceManager.cpp	2016-04-27 15:01:10 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.cpp	2016-11-09 15:21:35 +0000
@@ -21,19 +21,19 @@
 
 #include <paths.h>
 
-SurfaceManager *SurfaceManager::the_surface_manager = nullptr;
+SurfaceManager *SurfaceManager::m_instance = nullptr;
 
 SurfaceManager *SurfaceManager::instance()
 {
-    return the_surface_manager;
+    return m_instance;
 }
 
 SurfaceManager::SurfaceManager(QObject *parent) :
     QObject(parent)
     , m_virtualKeyboard(nullptr)
 {
-    Q_ASSERT(the_surface_manager == nullptr);
-    the_surface_manager = this;
+    Q_ASSERT(m_instance == nullptr);
+    m_instance = this;
 
     m_virtualKeyboard = new VirtualKeyboard;
     connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
@@ -46,14 +46,15 @@
 
 SurfaceManager::~SurfaceManager()
 {
-    Q_ASSERT(the_surface_manager == this);
-    the_surface_manager = nullptr;
+    Q_ASSERT(m_instance == this);
+    m_instance = nullptr;
 }
 
 MirSurface *SurfaceManager::createSurface(const QString& name,
                                           Mir::Type type,
                                           Mir::State state,
-                                          const QUrl& screenshot)
+                                          const QUrl& screenshot,
+                                          ApplicationInfo *application)
 {
     MirSurface* surface = new MirSurface(name, type, state, screenshot);
     connect(surface, &QObject::destroyed, this, [this](QObject *obj) {
@@ -68,7 +69,7 @@
     surface->setWidthIncrement(m_newSurfaceWidthIncrement);
     surface->setHeightIncrement(m_newSurfaceHeightIncrement);
 
-    Q_EMIT surfaceCreated(surface);
+    Q_EMIT surfaceCreated(surface, application);
     return surface;
 }
 

=== modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
--- tests/mocks/Unity/Application/SurfaceManager.h	2016-04-13 18:33:15 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.h	2016-11-09 15:21:35 +0000
@@ -44,7 +44,8 @@
     Q_INVOKABLE MirSurface* createSurface(const QString& name,
                                   Mir::Type type,
                                   Mir::State state,
-                                  const QUrl& screenshot);
+                                  const QUrl& screenshot,
+                                  ApplicationInfo *application);
 
     MirSurface* inputMethodSurface() const;
 
@@ -69,7 +70,7 @@
 Q_SIGNALS:
     void inputMethodSurfaceChanged();
     void countChanged();
-    void surfaceCreated(MirSurface *surface);
+    void surfaceCreated(MirSurface *surface, ApplicationInfo *application);
     void surfaceDestroyed(MirSurface*surface);
 
     void newSurfaceMinimumWidthChanged(int value);
@@ -80,7 +81,7 @@
     void newSurfaceHeightIncrementChanged(int value);
 
 private:
-    static SurfaceManager *the_surface_manager;
+    static SurfaceManager *m_instance;
     VirtualKeyboard *m_virtualKeyboard;
 
     int m_newSurfaceMinimumWidth{0};

=== added file 'tests/mocks/Unity/Application/TopLevelWindowModel.cpp'
--- tests/mocks/Unity/Application/TopLevelWindowModel.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/TopLevelWindowModel.cpp	2016-11-09 15:21:35 +0000
@@ -0,0 +1,610 @@
+/*
+ * 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 "TopLevelWindowModel.h"
+
+#include "SurfaceManager.h"
+
+Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel", QtWarningMsg)
+
+#define DEBUG_MSG qCDebug(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
+
+namespace unityapi = unity::shell::application;
+
+TopLevelWindowModel::TopLevelWindowModel()
+{
+    DEBUG_MSG;
+    auto *appManNotifier = ApplicationManagerNotifier::instance();
+
+    if (appManNotifier->applicationManager()) {
+        setApplicationManager(appManNotifier->applicationManager());
+    } else {
+        connect(appManNotifier, &ApplicationManagerNotifier::applicationManagerChanged,
+                this, &TopLevelWindowModel::setApplicationManager);
+    }
+}
+
+TopLevelWindowModel::~TopLevelWindowModel()
+{
+    DEBUG_MSG;
+}
+
+unityapi::MirSurfaceInterface* TopLevelWindowModel::inputMethodSurface() const
+{
+    return m_inputMethodWindow ? m_inputMethodWindow->surface() : nullptr;
+}
+
+void TopLevelWindowModel::connectSurfaceManager()
+{
+    if (m_connectedSurfaceManager)
+        return;
+
+    auto surfaceManager = SurfaceManager::instance();
+    Q_ASSERT(surfaceManager != nullptr);
+
+    setInputMethodSurface(surfaceManager->inputMethodSurface());
+
+    connect(surfaceManager, &SurfaceManager::inputMethodSurfaceChanged,
+            this, [&]() {
+        setInputMethodSurface(surfaceManager->inputMethodSurface());
+    });
+
+    connect(surfaceManager, &SurfaceManager::surfaceCreated,
+        this, &TopLevelWindowModel::prependSurface);
+
+    m_connectedSurfaceManager = true;
+}
+
+void TopLevelWindowModel::setApplicationManager(ApplicationManager* value)
+{
+    if (m_applicationManager == value) {
+        return;
+    }
+
+    Q_ASSERT(m_modelState == IdleState);
+    m_modelState = ResettingState;
+
+    beginResetModel();
+
+    if (m_applicationManager) {
+        m_windowModel.clear();
+        disconnect(m_applicationManager, 0, this, 0);
+    }
+
+    m_applicationManager = value;
+
+    if (m_applicationManager) {
+        // we're in business!
+        connectSurfaceManager();
+
+        connect(m_applicationManager, &QAbstractItemModel::rowsInserted,
+                this, [this](const QModelIndex &/*parent*/, int first, int last) {
+                    for (int i = first; i <= last; ++i) {
+                        auto application = m_applicationManager->get(i);
+                        addApplication(static_cast<ApplicationInfo*>(application));
+                    }
+                });
+
+        connect(m_applicationManager, &QAbstractItemModel::rowsAboutToBeRemoved,
+                this, [this](const QModelIndex &/*parent*/, int first, int last) {
+                    for (int i = first; i <= last; ++i) {
+                        auto application = m_applicationManager->get(i);
+                        removeApplication(static_cast<ApplicationInfo*>(application));
+                    }
+                    // fake-miral
+                    // Do it after ApplicationManager has finished changing its model
+                    QMetaObject::invokeMethod(this, "focusTopMostAvailableWindow", Qt::QueuedConnection);
+                });
+
+        for (int i = 0; i < m_applicationManager->rowCount(); ++i) {
+            auto application = m_applicationManager->get(i);
+            addApplication(static_cast<ApplicationInfo*>(application));
+        }
+    }
+
+    endResetModel();
+    m_modelState = IdleState;
+}
+
+void TopLevelWindowModel::focusTopMostAvailableWindow()
+{
+    DEBUG_MSG << "()";
+    setFocusedWindow(findFocusableWindow(0));
+}
+
+void TopLevelWindowModel::addApplication(ApplicationInfo *application)
+{
+    DEBUG_MSG << "(" << application->appId() << ")";
+
+    if (application->state() != unityapi::ApplicationInfoInterface::Stopped && application->surfaceList()->count() == 0) {
+        prependPlaceholder(application);
+    } else {
+        auto *surfaceList = application->surfaceList();
+        for (int i = 0; i < surfaceList->count(); ++i) {
+            prependSurface(static_cast<MirSurface*>(surfaceList->get(i)), application);
+        }
+    }
+}
+
+void TopLevelWindowModel::removeApplication(ApplicationInfo *application)
+{
+    DEBUG_MSG << "(" << application->appId() << ")";
+
+    Q_ASSERT(m_modelState == IdleState);
+
+    int i = 0;
+    while (i < m_windowModel.count()) {
+        if (m_windowModel.at(i).application == application) {
+            removeAt(i);
+        } else {
+            ++i;
+        }
+    }
+
+    DEBUG_MSG << " after " << toString();
+}
+
+void TopLevelWindowModel::prependPlaceholder(ApplicationInfo *application)
+{
+    DEBUG_MSG << "(" << application->appId() << ")";
+
+    prependSurfaceHelper(nullptr, application);
+}
+
+void TopLevelWindowModel::prependSurface(MirSurface *surface, ApplicationInfo *application)
+{
+    Q_ASSERT(surface != nullptr);
+
+    bool filledPlaceholder = false;
+    for (int i = 0; i < m_windowModel.count() && !filledPlaceholder; ++i) {
+        ModelEntry &entry = m_windowModel[i];
+        if (entry.application == application && entry.window->surface() == nullptr) {
+            // fake-miral: focus the newly added surface
+            if (entry.window->focused()) {
+                surface->setFocused(true);
+            }
+
+            entry.window->setSurface(surface);
+            connectSurface(surface);
+            DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface
+                      << ", filling out placeholder. after: " << toString();
+            filledPlaceholder = true;
+        }
+    }
+
+    if (!filledPlaceholder) {
+        DEBUG_MSG << " appId=" << application->appId() << " surface=" << surface << ", adding new row";
+        prependSurfaceHelper(surface, application);
+    }
+}
+
+void TopLevelWindowModel::prependSurfaceHelper(MirSurface *surface, ApplicationInfo *application)
+{
+    if (m_modelState == IdleState) {
+        m_modelState = InsertingState;
+        beginInsertRows(QModelIndex(), 0 /*first*/, 0 /*last*/);
+    } else {
+        Q_ASSERT(m_modelState == ResettingState);
+        // No point in signaling anything if we're resetting the whole model
+    }
+
+    int id = generateId();
+    Window *window = new Window(id);
+    if (surface) {
+        window->setSurface(surface);
+    }
+    m_windowModel.prepend(ModelEntry(window, application));
+    if (surface) {
+        connectSurface(surface);
+    }
+
+    connect(window, &WindowInterface::focusRequested, this, [this, window]() {
+        // fake-miral: just comply
+        setFocusedWindow(window);
+    });
+
+    connect(window, &Window::closeRequested, this, [this, window]() {
+        onWindowCloseRequested(window);
+    });
+
+    connect(window, &Window::stateRequested, this, [this, window](Mir::State requestedState) {
+        onStateChangeRequested(window, requestedState);
+    });
+
+    if (m_modelState == InsertingState) {
+        endInsertRows();
+        Q_EMIT countChanged();
+        Q_EMIT listChanged();
+        m_modelState = IdleState;
+    }
+
+    // fake-miral: focus the newly added window
+    setFocusedWindow(window);
+
+    DEBUG_MSG << " after " << toString();
+}
+
+void TopLevelWindowModel::onWindowCloseRequested(Window *window)
+{
+    if (!window->surface()) {
+        int index = indexOf(window);
+        Q_ASSERT(index >= 0);
+        m_windowModel[index].application->close();
+    }
+}
+
+void TopLevelWindowModel::connectSurface(MirSurface *surface)
+{
+    connect(surface, &MirSurfaceInterface::liveChanged, this, [this, surface](bool live){
+            if (!live) {
+                onSurfaceDied(surface);
+            }
+        });
+
+    connect(surface, &QObject::destroyed, this, [this, surface](){ this->onSurfaceDestroyed(surface); });
+}
+
+void TopLevelWindowModel::onStateChangeRequested(Window *window, Mir::State requestedState)
+{
+    if (requestedState == window->state()) {
+        return;
+    }
+
+    // fake-miral
+
+    window->setState(requestedState);
+
+    if (requestedState == Mir::MinimizedState) {
+        if (m_focusedWindow && m_focusedWindow == window) {
+            setFocusedWindow(findFocusableWindow(indexOf(window)+1));
+        }
+    } else if (window->state() == Mir::MinimizedState || window->state() == Mir::HiddenState) {
+        if (requestedState != Mir::MinimizedState && requestedState != Mir::HiddenState) {
+            setFocusedWindow(window);
+        }
+    }
+}
+
+Window *TopLevelWindowModel::findFocusableWindow(int index)
+{
+    Q_ASSERT(index >= 0);
+
+    // the simplest thing possible. this is a fake implementation afterall
+    if (index < m_windowModel.count()) {
+        auto candidate = m_windowModel[index].window;
+        if (candidate->state() != Mir::MinimizedState && candidate->state() != Mir::HiddenState) {
+            return candidate;
+        } else {
+            return findFocusableWindow(index + 1);
+        }
+    } else {
+        return nullptr;
+    }
+}
+
+void TopLevelWindowModel::onSurfaceDied(MirSurfaceInterface *surface)
+{
+    int i = indexOf(surface);
+    if (i == -1) {
+        return;
+    }
+
+    auto application = m_windowModel[i].application;
+
+    // can't be starting if it already has a surface
+    Q_ASSERT(application->state() != unityapi::ApplicationInfoInterface::Starting);
+
+    if (application->state() == unityapi::ApplicationInfoInterface::Running) {
+        m_windowModel[i].removeOnceSurfaceDestroyed = true;
+    } else {
+        // assume it got killed by the out-of-memory daemon.
+        //
+        // So leave entry in the model and only remove its surface, so shell can display a screenshot
+        // in its place.
+        m_windowModel[i].removeOnceSurfaceDestroyed = false;
+    }
+}
+
+void TopLevelWindowModel::onSurfaceDestroyed(MirSurfaceInterface *surface)
+{
+    int i = indexOf(surface);
+    if (i == -1) {
+        return;
+    }
+
+    if (m_windowModel[i].removeOnceSurfaceDestroyed) {
+        removeAt(i);
+    } else {
+        m_windowModel[i].window->setSurface(nullptr);
+        DEBUG_MSG << " Removed surface from entry. After: " << toString();
+    }
+
+    disconnect(surface, 0, this, 0);
+}
+
+void TopLevelWindowModel::removeAt(int index)
+{
+    Q_ASSERT(index >= 0 && index < m_windowModel.count());
+
+    if (m_modelState == IdleState) {
+        beginRemoveRows(QModelIndex(), index, index);
+        m_modelState = RemovingState;
+    } else {
+        Q_ASSERT(m_modelState == ResettingState);
+        // No point in signaling anything if we're resetting the whole model
+    }
+
+    auto window = m_windowModel[index].window;
+    if (window == focusedWindow()) {
+        setFocusedWindow(nullptr);
+    }
+
+    m_windowModel.removeAt(index);
+
+    delete window;
+
+    if (m_modelState == RemovingState) {
+        endRemoveRows();
+        Q_EMIT countChanged();
+        Q_EMIT listChanged();
+        m_modelState = IdleState;
+    }
+
+    DEBUG_MSG << " after " << toString();
+}
+
+void TopLevelWindowModel::setInputMethodSurface(MirSurface *surface)
+{
+    if (m_inputMethodWindow) {
+        qDebug("Multiple Input Method Surfaces created, removing the old one!");
+        delete m_inputMethodWindow;
+    }
+    m_inputMethodWindow = new Window(generateId());
+    m_inputMethodWindow->setSurface(surface);
+    if (surface) {
+        connectSurface(surface);
+    }
+    Q_EMIT inputMethodSurfaceChanged(m_inputMethodWindow->surface());
+}
+
+void TopLevelWindowModel::removeInputMethodWindow()
+{
+    if (m_inputMethodWindow) {
+        delete m_inputMethodWindow;
+        m_inputMethodWindow = nullptr;
+        Q_EMIT inputMethodSurfaceChanged(nullptr);
+    }
+}
+
+int TopLevelWindowModel::rowCount(const QModelIndex &/*parent*/) const
+{
+    return m_windowModel.count();
+}
+
+QVariant TopLevelWindowModel::data(const QModelIndex& index, int role) const
+{
+    if (index.row() < 0 || index.row() >= m_windowModel.size())
+        return QVariant();
+
+    if (role == WindowRole) {
+        unityapi::WindowInterface *window = m_windowModel.at(index.row()).window;
+        return QVariant::fromValue(window);
+    } else if (role == ApplicationRole) {
+        return QVariant::fromValue(m_windowModel.at(index.row()).application);
+    } else {
+        return QVariant();
+    }
+}
+
+int TopLevelWindowModel::generateId()
+{
+    int id = m_nextId;
+    m_nextId = nextFreeId(m_nextId + 1);
+    Q_EMIT nextIdChanged();
+    return id;
+}
+
+int TopLevelWindowModel::nextFreeId(int candidateId)
+{
+    if (candidateId > m_maxId) {
+        return nextFreeId(1);
+    } else {
+        if (indexForId(candidateId) == -1) {
+            // it's indeed free
+            return candidateId;
+        } else {
+            return nextFreeId(candidateId + 1);
+        }
+    }
+}
+
+QString TopLevelWindowModel::toString()
+{
+    QString str;
+    for (int i = 0; i < m_windowModel.count(); ++i) {
+        auto item = m_windowModel.at(i);
+
+        QString itemStr = QString("(index=%1,appId=%2,surface=0x%3,id=%4)")
+            .arg(i)
+            .arg(item.application->appId())
+            .arg((qintptr)item.window->surface(), 0, 16)
+            .arg(item.window->id());
+
+        if (i > 0) {
+            str.append(",");
+        }
+        str.append(itemStr);
+    }
+    return str;
+}
+
+int TopLevelWindowModel::indexOf(WindowInterface *window)
+{
+    for (int i = 0; i < m_windowModel.count(); ++i) {
+        if (m_windowModel.at(i).window == window) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+int TopLevelWindowModel::indexOf(MirSurfaceInterface *surface)
+{
+    for (int i = 0; i < m_windowModel.count(); ++i) {
+        if (m_windowModel.at(i).window->surface() == surface) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+int TopLevelWindowModel::indexForId(int id) const
+{
+    for (int i = 0; i < m_windowModel.count(); ++i) {
+        if (m_windowModel[i].window->id() == id) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+unityapi::WindowInterface *TopLevelWindowModel::windowAt(int index) const
+{
+    if (index >=0 && index < m_windowModel.count()) {
+        return m_windowModel[index].window;
+    } else {
+        return nullptr;
+    }
+}
+
+unityapi::MirSurfaceInterface *TopLevelWindowModel::surfaceAt(int index) const
+{
+    auto window = windowAt(index);
+    return window ? window->surface() : nullptr;
+}
+
+unityapi::ApplicationInfoInterface *TopLevelWindowModel::applicationAt(int index) const
+{
+    if (index >=0 && index < m_windowModel.count()) {
+        return m_windowModel[index].application;
+    } else {
+        return nullptr;
+    }
+}
+
+int TopLevelWindowModel::idAt(int index) const
+{
+    if (index >=0 && index < m_windowModel.count()) {
+        return m_windowModel[index].window->id();
+    } else {
+        return 0;
+    }
+}
+
+void TopLevelWindowModel::raiseId(int id)
+{
+    if (m_modelState == IdleState) {
+        DEBUG_MSG << "(id=" << id << ") - do it now.";
+        doRaiseId(id);
+    } else {
+        DEBUG_MSG << "(id=" << id << ") - Model busy (modelState=" << m_modelState << "). Try again in the next event loop.";
+        // The model has just signalled some change. If we have a Repeater responding to this update, it will get nuts
+        // if we perform yet another model change straight away.
+        //
+        // A bad sympton of this problem is a Repeater.itemAt(index) call returning null event though Repeater.count says
+        // the index is definitely within bounds.
+        QMetaObject::invokeMethod(this, "raiseId", Qt::QueuedConnection, Q_ARG(int, id));
+    }
+}
+
+void TopLevelWindowModel::doRaiseId(int id)
+{
+    int fromIndex = indexForId(id);
+    if (fromIndex != -1) {
+        move(fromIndex, 0);
+    }
+}
+
+Window *TopLevelWindowModel::findWindowWithSurface(MirSurface *surface)
+{
+    for (int i = 0; i < m_windowModel.count(); ++i) {
+        Window *window = m_windowModel[i].window;
+        if (window->surface() == surface) {
+            return window;
+        }
+    }
+    return nullptr;
+}
+
+void TopLevelWindowModel::setFocusedWindow(Window *window)
+{
+    if (window != m_focusedWindow) {
+        DEBUG_MSG << "(" << (window ? window->toString() : "null") << ")";
+
+        Window* previousWindow = m_focusedWindow;
+
+        // fake-miral: restore window if needed
+        if (window && (window->state() == Mir::MinimizedState || window->state() == Mir::HiddenState)) {
+            window->setState(Mir::RestoredState);
+        }
+
+        m_focusedWindow = window;
+        Q_EMIT focusedWindowChanged(m_focusedWindow);
+
+        if (previousWindow) {
+            // fake-miral
+            previousWindow->setFocused(false);
+        }
+
+        if (m_focusedWindow) {
+            // fake-miral
+            m_focusedWindow->setFocused(true);
+            raiseId(m_focusedWindow->id());
+        }
+    }
+}
+
+unityapi::WindowInterface* TopLevelWindowModel::focusedWindow() const
+{
+    return m_focusedWindow;
+}
+
+void TopLevelWindowModel::move(int from, int to)
+{
+    if (from == to) return;
+    DEBUG_MSG << " from=" << from << " to=" << to;
+
+    if (from >= 0 && from < m_windowModel.size() && to >= 0 && to < m_windowModel.size()) {
+        QModelIndex parent;
+        /* When moving an item down, the destination index needs to be incremented
+           by one, as explained in the documentation:
+           http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */
+
+        Q_ASSERT(m_modelState == IdleState);
+        m_modelState = MovingState;
+
+        beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));
+        ModelEntry entry = m_windowModel.takeAt(from);
+        m_windowModel.insert(to, entry);
+        endMoveRows();
+
+        m_modelState = IdleState;
+
+        DEBUG_MSG << " after " << toString();
+
+        Q_EMIT listChanged();
+    }
+}

=== added file 'tests/mocks/Unity/Application/TopLevelWindowModel.h'
--- tests/mocks/Unity/Application/TopLevelWindowModel.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/TopLevelWindowModel.h	2016-11-09 15:21:35 +0000
@@ -0,0 +1,146 @@
+/*
+ * 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/>.
+ */
+
+#pragma once
+
+#include <QLoggingCategory>
+
+#include "ApplicationManager.h"
+
+// unity-api
+#include <unity/shell/application/TopLevelWindowModelInterface.h>
+
+// local
+#include "Window.h"
+
+Q_DECLARE_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL)
+
+/*
+    This is a copy of TopLevelWindowModel from qtmir (the real deal) with some small changes.
+
+    Yes, this code duplication sucks
+
+    IDEA: Move as much as possible of the implementation to TopLevelWindowModelInterface.h
+    in unity-api
+*/
+class TopLevelWindowModel : public unity::shell::application::TopLevelWindowModelInterface
+{
+    Q_OBJECT
+
+    /**
+      The id to be used on the next entry created
+      Useful for tests
+     */
+    Q_PROPERTY(int nextId READ nextId NOTIFY nextIdChanged)
+
+public:
+    TopLevelWindowModel();
+    virtual ~TopLevelWindowModel();
+
+    // From unity::shell::aplication::TopLevelWindowModelInterface
+    unity::shell::application::MirSurfaceInterface* inputMethodSurface() const override;
+    unity::shell::application::WindowInterface* focusedWindow() const override;
+
+    // From QAbstractItemModel
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex& index, int role) const override;
+
+    // Own API
+    int nextId() const { return m_nextId; }
+
+public Q_SLOTS:
+    // From unity::shell::aplication::TopLevelWindowModelInterface
+    unity::shell::application::MirSurfaceInterface *surfaceAt(int index) const override;
+    unity::shell::application::WindowInterface *windowAt(int index) const override;
+    unity::shell::application::ApplicationInfoInterface *applicationAt(int index) const override;
+    int idAt(int index) const override;
+    int indexForId(int id) const override;
+    void raiseId(int id) override;
+
+Q_SIGNALS:
+    // Own API
+    void nextIdChanged();
+
+private Q_SLOTS:
+    void focusTopMostAvailableWindow();
+
+private:
+    void connectSurfaceManager();
+    void setApplicationManager(ApplicationManager*);
+    void doRaiseId(int id);
+    int generateId();
+    int nextFreeId(int candidateId);
+    QString toString();
+    int indexOf(WindowInterface *window);
+    int indexOf(MirSurfaceInterface *surface);
+
+    void setInputMethodSurface(MirSurface *surface);
+    void setFocusedWindow(Window *window);
+    void removeInputMethodWindow();
+    void removeAt(int index);
+
+    void addApplication(ApplicationInfo *application);
+    void removeApplication(ApplicationInfo *application);
+
+    void prependPlaceholder(ApplicationInfo *application);
+    void prependSurface(MirSurface *surface, ApplicationInfo *application);
+    void prependSurfaceHelper(MirSurface *surface, ApplicationInfo *application);
+
+    void connectSurface(MirSurface *surface);
+
+    void onStateChangeRequested(Window *window, Mir::State requestedState);
+    void onSurfaceDied(MirSurfaceInterface *surface);
+    void onSurfaceDestroyed(MirSurfaceInterface *surface);
+    void onWindowCloseRequested(Window *window);
+
+    Window *findWindowWithSurface(MirSurface *surface);
+
+    Window *findFocusableWindow(int index);
+
+    void move(int from, int to);
+
+    struct ModelEntry {
+        ModelEntry() {}
+        ModelEntry(Window *window,
+                   ApplicationInfo *application)
+            : window(window), application(application) {}
+        Window *window{nullptr};
+        ApplicationInfo *application{nullptr};
+        bool removeOnceSurfaceDestroyed{false};
+    };
+
+    QVector<ModelEntry> m_windowModel;
+    Window* m_inputMethodWindow{nullptr};
+    Window* m_focusedWindow{nullptr};
+    int m_nextId{1};
+    // Just something big enough that we don't risk running out of unused id numbers.
+    // Not sure if QML int type supports something close to std::numeric_limits<int>::max() and
+    // there's no reason to try out its limits.
+    static const int m_maxId{1000000};
+
+    ApplicationManagerInterface* m_applicationManager{nullptr};
+
+    enum ModelState {
+        IdleState,
+        InsertingState,
+        RemovingState,
+        MovingState,
+        ResettingState
+    };
+    ModelState m_modelState{IdleState};
+
+    bool m_connectedSurfaceManager{false};
+};

=== added file 'tests/mocks/Unity/Application/Window.cpp'
--- tests/mocks/Unity/Application/Window.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/Window.cpp	2016-11-09 15:21:35 +0000
@@ -0,0 +1,229 @@
+/*
+ * 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 "Window.h"
+#include "MirSurface.h"
+
+#include <QQmlEngine>
+
+#define WINDOW_DEBUG 0
+
+#if WINDOW_DEBUG
+#include <QDebug>
+#define DEBUG_MSG(params) qDebug().nospace() << qPrintable(toString()) << "::" << __func__  << " " << params
+#else
+#define DEBUG_MSG(params) ((void)0)
+#endif
+
+using namespace unity::shell::application;
+
+Window::Window(int id)
+    : WindowInterface(nullptr)
+    , m_id(id)
+{
+    DEBUG_MSG("");
+    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
+}
+
+Window::~Window()
+{
+    DEBUG_MSG("");
+}
+
+QPoint Window::position() const
+{
+    return m_position;
+}
+
+QPoint Window::requestedPosition() const
+{
+    return m_requestedPosition;
+}
+
+void Window::setRequestedPosition(const QPoint &value)
+{
+    if (value != m_requestedPosition) {
+        m_requestedPosition = value;
+        Q_EMIT requestedPositionChanged(m_requestedPosition);
+        if (m_surface) {
+            m_surface->setRequestedPosition(value);
+        } else {
+            // fake-miral: always comply
+            m_position = m_requestedPosition;
+            Q_EMIT positionChanged(m_position);
+        }
+    }
+}
+
+Mir::State Window::state() const
+{
+    return m_state;
+}
+
+bool Window::focused() const
+{
+    return m_focused;
+}
+
+bool Window::confinesMousePointer() const
+{
+    if (m_surface) {
+        return m_surface->confinesMousePointer();
+    } else {
+        return false;
+    }
+}
+
+int Window::id() const
+{
+    return m_id;
+}
+
+MirSurfaceInterface* Window::surface() const
+{
+    return m_surface;
+}
+
+void Window::requestState(Mir::State state)
+{
+    Q_EMIT stateRequested(state);
+}
+
+void Window::setState(Mir::State state)
+{
+    if (m_surface) {
+        m_surface->setState(state);
+    } else {
+        m_state = state;
+        Q_EMIT stateChanged(m_state);
+    }
+}
+
+void Window::requestFocus()
+{
+    if (m_surface) {
+        m_surface->requestFocus();
+    } else {
+        Q_EMIT focusRequested();
+    }
+}
+
+void Window::close()
+{
+    if (m_surface) {
+        m_surface->close();
+    } else {
+        Q_EMIT closeRequested();
+    }
+}
+
+void Window::setSurface(MirSurface *surface)
+{
+    if (m_surface) {
+        disconnect(m_surface, 0, this, 0);
+    }
+
+    m_surface = surface;
+
+    if (m_surface) {
+        connect(surface, &MirSurfaceInterface::focusRequested, this, [this]() {
+            Q_EMIT focusRequested();
+        });
+
+        connect(surface, &MirSurface::closeRequested, this, &Window::closeRequested);
+
+        connect(surface, &MirSurface::stateRequested, this, [this](Mir::State state) {
+            Q_EMIT stateRequested(state);
+        });
+
+        connect(surface, &MirSurfaceInterface::positionChanged, this, [this]() {
+            updatePosition();
+        });
+
+        connect(surface, &MirSurfaceInterface::stateChanged, this, [this]() {
+            updateState();
+        });
+
+        connect(surface, &MirSurfaceInterface::focusedChanged, this, [this]() {
+            updateFocused();
+        });
+
+        // bring it up to speed
+        m_surface->setRequestedPosition(m_requestedPosition);
+        m_surface->requestState(m_state);
+
+        // and sync with surface
+        updatePosition();
+        updateState();
+        updateFocused();
+    }
+
+    Q_EMIT surfaceChanged(surface);
+}
+
+void Window::updatePosition()
+{
+    if (m_surface->position() != m_position) {
+        m_position = m_surface->position();
+        Q_EMIT positionChanged(m_position);
+    }
+}
+
+void Window::updateState()
+{
+    if (m_surface->state() != m_state) {
+        m_state = m_surface->state();
+        Q_EMIT stateChanged(m_state);
+    }
+}
+
+void Window::updateFocused()
+{
+    if (m_surface->focused() != m_focused) {
+        m_focused = m_surface->focused();
+        Q_EMIT focusedChanged(m_focused);
+    }
+}
+
+
+void Window::setFocused(bool value)
+{
+    if (value != m_focused) {
+        DEBUG_MSG("(" << value << ")");
+        m_focused = value;
+        Q_EMIT focusedChanged(m_focused);
+        if (m_surface) {
+            m_surface->setFocused(m_focused);
+        }
+    } else {
+        DEBUG_MSG("(" << value << ") - NOOP");
+    }
+}
+
+QString Window::toString() const
+{
+    if (surface()) {
+    return QString("Window[0x%1, id=%2, MirSurface[0x%3,\"%4\"]]")
+            .arg((quintptr)this, 0, 16)
+            .arg(id())
+            .arg((quintptr)surface(), 0, 16)
+            .arg(surface()->name());
+    } else {
+        return QString("Window[0x%1, id=%2, null]")
+            .arg((quintptr)this, 0, 16)
+            .arg(id());
+    }
+}

=== added file 'tests/mocks/Unity/Application/Window.h'
--- tests/mocks/Unity/Application/Window.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/Window.h	2016-11-09 15:21:35 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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_WINDOW_H
+#define MOCK_WINDOW_H
+
+// unity-api
+#include <unity/shell/application/WindowInterface.h>
+
+class MirSurface;
+
+class Window : public unity::shell::application::WindowInterface
+{
+    Q_OBJECT
+
+public:
+    Window(int id);
+    virtual ~Window();
+    QPoint position() const override;
+    QPoint requestedPosition() const override;
+    void setRequestedPosition(const QPoint &) override;
+    Mir::State state() const override;
+    bool focused() const override;
+    bool confinesMousePointer() const override;
+    int id() const override;
+    unity::shell::application::MirSurfaceInterface* surface() const override;
+
+    void setSurface(MirSurface *surface);
+    void setFocused(bool value);
+    void setState(Mir::State state);
+
+    QString toString() const;
+
+Q_SIGNALS:
+    void stateRequested(Mir::State);
+    void closeRequested();
+
+public Q_SLOTS:
+    void requestState(Mir::State state) override;
+    void requestFocus() override;
+    void close() override;
+
+private:
+    void updatePosition();
+    void updateState();
+    void updateFocused();
+
+    QPoint m_position;
+    QPoint m_requestedPosition;
+    bool m_focused{false};
+    int m_id;
+    Mir::State m_state{Mir::RestoredState};
+    MirSurface *m_surface{nullptr};
+};
+
+#endif // MOCK_WINDOW_H

=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
--- tests/mocks/Unity/Application/plugin.cpp	2016-06-30 13:51:32 +0000
+++ tests/mocks/Unity/Application/plugin.cpp	2016-11-09 15:21:35 +0000
@@ -19,6 +19,8 @@
 #include "ApplicationManager.h"
 #include "MirSurfaceItem.h"
 #include "SurfaceManager.h"
+#include "TopLevelWindowModel.h"
+#include "Window.h"
 
 // unity-api
 #include <unity/shell/application/Mir.h>
@@ -32,9 +34,6 @@
 void createUnityApplicationSharedSingletons()
 {
     // they have to be created in a specific order
-    if (!MirFocusController::instance()) {
-        new MirFocusController;
-    }
     if (!SurfaceManager::instance()) {
         new SurfaceManager;
     }
@@ -48,16 +47,12 @@
 
 QObject* surfaceManagerSingleton(QQmlEngine*, QJSEngine*)
 {
-    createUnityApplicationSharedSingletons();
+    if (!SurfaceManager::instance()) {
+        new SurfaceManager;
+    }
     return SurfaceManager::instance();
 }
 
-QObject* mirFocusControllerSingleton(QQmlEngine*, QJSEngine*)
-{
-    createUnityApplicationSharedSingletons();
-    return MirFocusController::instance();
-}
-
 } // anonymous namespace
 
 void FakeUnityApplicationQmlPlugin::registerTypes(const char *uri)
@@ -67,18 +62,19 @@
     qRegisterMetaType<unity::shell::application::MirSurfaceListInterface*>("unity::shell::application::MirSurfaceListInterface*");
     qRegisterMetaType<Mir::Type>("Mir::Type");
     qRegisterMetaType<Mir::State>("Mir::State");
+    qRegisterMetaType<unity::shell::application::WindowInterface*>("unity::shell::application::WindowInterface*");
 
     qmlRegisterUncreatableType<unity::shell::application::ApplicationManagerInterface>(uri, 0, 1, "ApplicationManagerInterface", "Abstract interface. Cannot be created in QML");
     qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
     qmlRegisterUncreatableType<MirSurface>(uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
     qmlRegisterUncreatableType<unity::shell::application::MirSurfaceInterface>(
                     uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
-    qmlRegisterSingletonType<MirFocusController>(uri, 0, 1, "MirFocusController", mirFocusControllerSingleton);
     qmlRegisterType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");
     qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
 
     qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
     qmlRegisterSingletonType<SurfaceManager>(uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
+    qmlRegisterType<TopLevelWindowModel>(uri, 0, 1, "TopLevelWindowModel");
 
     qmlRegisterUncreatableType<Mir>(uri, 0, 1, "Mir", "Mir provides enum values, it can't be instantiated");
 }

=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
--- tests/qmltests/Stage/tst_DesktopStage.qml	2016-09-27 15:03:00 +0000
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2016-11-09 15:21:35 +0000
@@ -20,7 +20,6 @@
 import Ubuntu.Components.ListItems 1.3
 import Unity.Application 0.1
 import Unity.Test 0.1
-import WindowManager 0.1
 import Utils 0.1
 
 import ".." // For EdgeBarrierControls
@@ -57,9 +56,8 @@
         }
     }
 
-    TopLevelSurfaceList {
+    TopLevelWindowModel {
         id: topSurfaceList
-        applicationsModel: ApplicationManager
     }
 
     Loader {
@@ -170,8 +168,9 @@
             tryCompare(dashApp, "state", ApplicationInfoInterface.Running);
 
             tryCompare(topSurfaceList, "count", 1);
-            tryCompareFunction(function(){return topSurfaceList.surfaceAt(0) != null;}, true);
-            compare(MirFocusController.focusedSurface, topSurfaceList.surfaceAt(0));
+            tryCompareFunction(function(){return topSurfaceList.windowAt(0) != null;}, true);
+            topSurfaceList.windowAt(0).requestFocus();
+            tryCompare(topSurfaceList, "focusedWindow", topSurfaceList.windowAt(0));
         }
 
         function cleanup() {
@@ -284,13 +283,13 @@
             verify(fromAppWindow);
             tap(fromAppWindow);
             compare(fromDelegate.surface.activeFocus, true);
-            compare(MirFocusController.focusedSurface, fromDelegate.surface);
+            compare(topSurfaceList.focusedWindow, fromDelegate.window);
 
             var toAppWindow = findChild(toDelegate, "appWindow");
             verify(toAppWindow);
             tap(toAppWindow);
             compare(toDelegate.surface.activeFocus, true);
-            compare(MirFocusController.focusedSurface, toDelegate.surface);
+            compare(topSurfaceList.focusedWindow, toDelegate.window);
         }
 
         function test_clickingOnWindowChangesFocusedApp_data() {
@@ -309,13 +308,13 @@
             verify(fromAppWindow);
             mouseClick(fromAppWindow);
             compare(fromDelegate.surface.activeFocus, true);
-            compare(MirFocusController.focusedSurface, fromDelegate.surface);
+            compare(topSurfaceList.focusedWindow, fromDelegate.window);
 
             var toAppWindow = findChild(toDelegate, "appWindow");
             verify(toAppWindow);
             mouseClick(toAppWindow);
             compare(toDelegate.surface.activeFocus, true);
-            compare(MirFocusController.focusedSurface, toDelegate.surface);
+            compare(topSurfaceList.focusedWindow, toDelegate.window);
         }
 
         function test_tappingOnDecorationFocusesApplication_data() {
@@ -343,6 +342,13 @@
             return findChild(appDelegate, "appWindowDecoration");
         }
 
+        function maximizeDelegate(appDelegate) {
+            var maximizeButton = findChild(appDelegate, "maximizeWindowButton");
+            verify(maximizeButton);
+            mouseClick(maximizeButton);
+            tryCompare(appDelegate, "visuallyMaximized", true);
+        }
+
         function test_tappingOnDecorationFocusesApplication(data) {
             var appDelegates = [];
             for (var i = 0; i < data.apps.length; i++) {
@@ -512,11 +518,11 @@
             apps.forEach(startApplication);
             verify(topSurfaceList.count == 3);
             keyClick(Qt.Key_D, Qt.MetaModifier|Qt.ControlModifier); // Ctrl+Super+D shortcut to minimize all
-            tryCompare(MirFocusController, "focusedSurface", null); // verify no surface is focused
+            tryCompare(topSurfaceList, "focusedWindow", null); // verify no window is focused
 
             // now try pressing all 4 arrow keys + ctrl + meta
             keyClick(Qt.Key_Up | Qt.Key_Down | Qt.Key_Left | Qt.Key_Right, Qt.MetaModifier|Qt.ControlModifier); // smash it!!!
-            tryCompare(MirFocusController, "focusedSurface", null); // verify still no surface is focused
+            tryCompare(topSurfaceList, "focusedWindow", null); // verify still no window is focused
         }
 
         function test_minimizeApplicationHidesSurface() {
@@ -527,9 +533,12 @@
             var decoratedWindow = findDecoratedWindow(dashSurfaceId);
             verify(decoratedWindow);
 
-            tryCompare(dashSurface, "visible", true);
-            decoratedWindow.minimizeClicked();
-            tryCompare(dashSurface, "visible", false);
+            var minimizeButton = findChild(decoratedWindow, "minimizeWindowButton");
+            verify(minimizeButton);
+
+            tryCompare(dashSurface, "exposed", true);
+            mouseClick(minimizeButton);
+            tryCompare(dashSurface, "exposed", false);
         }
 
         function test_maximizeApplicationHidesSurfacesBehindIt() {
@@ -538,16 +547,16 @@
             var gmailDelegate = startApplication("gmail-webapp");
 
             // maximize without raising
-            dialerDelegate.maximize();
+            dialerDelegate.requestMaximize();
             tryCompare(dialerDelegate, "visuallyMaximized", true);
 
-            tryCompare(dashDelegate.surface, "visible", false);
-            compare(gmailDelegate.surface.visible, true);
+            tryCompare(dashDelegate.surface, "exposed", false);
+            compare(gmailDelegate.surface.exposed, true);
 
             // restore without raising
-            dialerDelegate.restoreFromMaximized();
-            compare(dashDelegate.surface.visible, true);
-            compare(gmailDelegate.surface.visible, true);
+            dialerDelegate.requestRestore();
+            compare(dashDelegate.surface.exposed, true);
+            compare(gmailDelegate.surface.exposed, true);
         }
 
         function test_applicationsBecomeVisibleWhenOccludingAppRemoved() {
@@ -580,26 +589,22 @@
             tryCompare(dialerDelegate, "visuallyMaximized", true);
             tryCompare(gmailDelegate, "visuallyMaximized", true);
 
-            tryCompare(dashApp.surfaceList.get(0), "visible", false);
-            tryCompare(dialerApp.surfaceList.get(0), "visible", false);
-            tryCompare(mapApp.surfaceList.get(0), "visible", false);
+            tryCompare(dashApp.surfaceList.get(0), "exposed", false);
+            tryCompare(dialerApp.surfaceList.get(0), "exposed", false);
+            tryCompare(mapApp.surfaceList.get(0), "exposed", false);
 
             ApplicationManager.stopApplication("gmail-webapp");
             wait(2000)
 
-            tryCompare(mapApp.surfaceList.get(0), "visible", true);
-            tryCompare(dialerApp.surfaceList.get(0), "visible", true);
-            tryCompare(dashApp.surfaceList.get(0), "visible", false); // still occluded by maximised dialer
+            tryCompare(mapApp.surfaceList.get(0), "exposed", true);
+            tryCompare(dialerApp.surfaceList.get(0), "exposed", true);
+            tryCompare(dashApp.surfaceList.get(0), "exposed", false); // still occluded by maximised dialer
         }
 
         function test_maximisedAppStaysVisibleWhenAppStarts() {
             var dashDelegate = startApplication("unity8-dash");
 
-            // maximize
-            var dashMaximizeButton = findChild(dashDelegate, "maximizeWindowButton");
-            verify(dashMaximizeButton);
-            mouseClick(dashMaximizeButton);
-            tryCompare(dashDelegate, "visuallyMaximized", true);
+            maximizeDelegate(dashDelegate);
 
             var dialerDelegate = startApplication("dialer-app");
             verify(dialerDelegate);
@@ -621,25 +626,25 @@
             tryCompare(facebookAppDelegate, "visible", true);
 
             // Maximize the topmost and make sure the other two are hidden
-            facebookAppDelegate.maximize();
+            maximizeDelegate(facebookAppDelegate);
             tryCompare(dashAppDelegate, "visible", false);
             tryCompare(dialerAppDelegate, "visible", false);
             tryCompare(facebookAppDelegate, "visible", true);
 
             // Bring dash to front. make sure dash and the maximized facebook are visible, the restored one behind is hidden
-            dashAppDelegate.focus = true;
+            dashAppDelegate.requestFocus();
             tryCompare(dashAppDelegate, "visible", true);
             tryCompare(dialerAppDelegate, "visible", false);
             tryCompare(facebookAppDelegate, "visible", true);
 
             // Now focus the dialer app. all 3 should be visible again
-            dialerAppDelegate.focus = true;
+            dialerAppDelegate.requestFocus();
             tryCompare(dashAppDelegate, "visible", true);
             tryCompare(dialerAppDelegate, "visible", true);
             tryCompare(facebookAppDelegate, "visible", true);
 
             // Maximize the dialer app. The other 2 should hide
-            dialerAppDelegate.maximize();
+            maximizeDelegate(dialerAppDelegate);
             tryCompare(dashAppDelegate, "visible", false);
             tryCompare(dialerAppDelegate, "visible", true);
             tryCompare(facebookAppDelegate, "visible", false);
@@ -648,7 +653,7 @@
         function test_dropShadow() {
             // start an app, maximize it
             var facebookAppDelegate = startApplication("facebook-webapp");
-            facebookAppDelegate.maximize();
+            maximizeDelegate(facebookAppDelegate);
 
             // verify the drop shadow is still not visible
             verify(PanelState.dropShadow == false);

=== modified file 'tests/qmltests/Stage/tst_PhoneStage.qml'
--- tests/qmltests/Stage/tst_PhoneStage.qml	2016-10-08 16:45:37 +0000
+++ tests/qmltests/Stage/tst_PhoneStage.qml	2016-11-09 15:21:35 +0000
@@ -22,7 +22,6 @@
 import "../../../qml/Stage"
 import Ubuntu.Components 1.3
 import Unity.Application 0.1
-import WindowManager 0.1
 
 Item {
     id: root
@@ -41,9 +40,8 @@
         orientations: Orientations {}
         applicationManager: ApplicationManager
         mode: "staged"
-        topLevelSurfaceList: TopLevelSurfaceList {
+        topLevelSurfaceList: TopLevelWindowModel {
             id: topLevelSurfaceList
-            applicationsModel: ApplicationManager
         }
     }
 
@@ -505,7 +503,7 @@
         function test_selectSuspendedAppWithoutSurface() {
             compare(topLevelSurfaceList.applicationAt(0).appId, "unity8-dash");
             var dashSurfaceId = topLevelSurfaceList.idAt(0);
-            var dashSurface = topLevelSurfaceList.surfaceAt(0);
+            var dashWindow = topLevelSurfaceList.windowAt(0);
 
             var webbrowserSurfaceId = topLevelSurfaceList.nextId;
             var webbrowserApp  = ApplicationManager.startApplication("webbrowser-app");
@@ -513,7 +511,7 @@
 
             switchToSurface(dashSurfaceId);
 
-            tryCompare(MirFocusController, "focusedSurface", dashSurface);
+            tryCompare(topLevelSurfaceList, "focusedWindow", dashWindow);
             tryCompare(webbrowserApp, "state", ApplicationInfoInterface.Suspended);
 
             compare(webbrowserApp.surfaceList.count, 1);
@@ -549,7 +547,7 @@
         {
             compare(topLevelSurfaceList.applicationAt(0).appId, "unity8-dash");
             var dashSurfaceId = topLevelSurfaceList.idAt(0);
-            var dashSurface = topLevelSurfaceList.surfaceAt(0);
+            var dashWindow = topLevelSurfaceList.windowAt(0);
 
             var webbrowserSurfaceId = topLevelSurfaceList.nextId;
             var webbrowserApp  = ApplicationManager.startApplication("webbrowser-app");
@@ -557,7 +555,7 @@
 
             switchToSurface(dashSurfaceId);
 
-            tryCompare(MirFocusController, "focusedSurface", dashSurface);
+            tryCompare(topLevelSurfaceList, "focusedWindow", dashWindow);
             tryCompare(webbrowserApp, "state", ApplicationInfoInterface.Suspended);
 
             compare(webbrowserApp.surfaceList.count, 1);

=== modified file 'tests/qmltests/Stage/tst_TabletStage.qml'
--- tests/qmltests/Stage/tst_TabletStage.qml	2016-10-08 16:45:37 +0000
+++ tests/qmltests/Stage/tst_TabletStage.qml	2016-11-09 15:21:35 +0000
@@ -21,7 +21,6 @@
 import Unity.Application 0.1
 import Unity.Test 0.1
 import Utils 0.1
-import WindowManager 0.1
 
 import ".."
 import "../../../qml/Stage"
@@ -50,9 +49,8 @@
         focus: true
         mode: "stagedWithSideStage"
         applicationManager: ApplicationManager
-        topLevelSurfaceList: TopLevelSurfaceList {
+        topLevelSurfaceList: TopLevelWindowModel {
             id: topLevelSurfaceList
-            applicationsModel: ApplicationManager
         }
     }
 
@@ -628,7 +626,7 @@
         function test_selectSuspendedAppWithoutSurface() {
             compare(topSurfaceList.applicationAt(0).appId, "unity8-dash");
             var dashSurfaceId = topSurfaceList.idAt(0);
-            var dashSurface = topSurfaceList.surfaceAt(0);
+            var dashWindow = topSurfaceList.windowAt(0);
 
             var webbrowserSurfaceId = topSurfaceList.nextId;
             webbrowserCheckBox.checked = true;
@@ -637,7 +635,7 @@
 
             switchToSurface(dashSurfaceId);
 
-            tryCompare(MirFocusController, "focusedSurface", dashSurface);
+            tryCompare(topLevelSurfaceList, "focusedWindow", dashWindow);
             tryCompare(webbrowserApp, "state", ApplicationInfoInterface.Suspended);
 
             compare(webbrowserApp.surfaceList.count, 1);

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2016-10-03 11:15:27 +0000
+++ tests/qmltests/tst_Shell.qml	2016-11-09 15:21:35 +0000
@@ -52,6 +52,15 @@
     }
 
     property var shell: shellLoader.item ? shellLoader.item : null
+    onShellChanged: {
+        if (shell) {
+            topLevelSurfaceList = testCase.findInvisibleChild(shell, "topLevelSurfaceList");
+        } else {
+            topLevelSurfaceList = null;
+        }
+    }
+
+    property var topLevelSurfaceList: null
 
     Item {
         id: shellContainer
@@ -318,21 +327,21 @@
                         id: fullscreeAppCheck
 
                         onTriggered: {
-                            if (!MirFocusController.focusedSurface) return;
-                            if (MirFocusController.focusedSurface.state == Mir.FullscreenState) {
-                                MirFocusController.focusedSurface.state = Mir.RestoredState;
+                            if (!topLevelSurfaceList.focusedSurface) return;
+                            if (topLevelSurfaceList.focusedSurface.state == Mir.FullscreenState) {
+                                topLevelSurfaceList.focusedSurface.requestState(Mir.RestoredState);
                             } else {
-                                MirFocusController.focusedSurface.state = Mir.FullscreenState;
+                                topLevelSurfaceList.focusedSurface.requestState(Mir.FullscreenState);
                             }
                         }
 
                         Binding {
                             target: fullscreeAppCheck
-                            when: MirFocusController.focusedSurface
+                            when: topLevelSurfaceList && topLevelSurfaceList.focusedSurface
                             property: "checked"
                             value: {
-                                if (!MirFocusController.focusedSurface) return false;
-                                return MirFocusController.focusedSurface.state === Mir.FullscreenState
+                                if (!topLevelSurfaceList || !topLevelSurfaceList.focusedSurface) return false;
+                                return topLevelSurfaceList.focusedSurface.state === Mir.FullscreenState
                             }
                         }
                     }
@@ -346,21 +355,21 @@
                         id: chromeAppCheck
 
                         onTriggered: {
-                            if (!MirFocusController.focusedSurface) return;
-                            if (MirFocusController.focusedSurface.shellChrome == Mir.LowChrome) {
-                                MirFocusController.focusedSurface.setShellChrome(Mir.NormalChrome);
+                            if (!topLevelSurfaceList.focusedSurface) return;
+                            if (topLevelSurfaceList.focusedSurface.shellChrome == Mir.LowChrome) {
+                                topLevelSurfaceList.focusedSurface.setShellChrome(Mir.NormalChrome);
                             } else {
-                                MirFocusController.focusedSurface.setShellChrome(Mir.LowChrome);
+                                topLevelSurfaceList.focusedSurface.setShellChrome(Mir.LowChrome);
                             }
                         }
 
                         Binding {
                             target: chromeAppCheck
-                            when: MirFocusController.focusedSurface !== null
+                            when: topLevelSurfaceList && topLevelSurfaceList.focusedSurface !== null
                             property: "checked"
                             value: {
-                                if (!MirFocusController.focusedSurface) return false;
-                                MirFocusController.focusedSurface.shellChrome === Mir.LowChrome
+                                if (!topLevelSurfaceList || !topLevelSurfaceList.focusedSurface) return false;
+                                topLevelSurfaceList.focusedSurface.shellChrome === Mir.LowChrome
                             }
                         }
                     }
@@ -950,21 +959,21 @@
             loadShell("phone");
             swipeAwayGreeter();
             var item = findChild(shell, "inputMethod");
-            var surface = SurfaceManager.inputMethodSurface;
-
-            surface.setState(Mir.MinimizedState);
-            tryCompare(item, "visible", false);
-
-            surface.setState(Mir.RestoredState);
-            tryCompare(item, "visible", true);
-
-            surface.setState(Mir.MinimizedState);
-            tryCompare(item, "visible", false);
-
-            surface.setState(Mir.MaximizedState);
-            tryCompare(item, "visible", true);
-
-            surface.setState(Mir.MinimizedState);
+            var surface = topLevelSurfaceList.inputMethodSurface;
+
+            surface.requestState(Mir.MinimizedState);
+            tryCompare(item, "visible", false);
+
+            surface.requestState(Mir.RestoredState);
+            tryCompare(item, "visible", true);
+
+            surface.requestState(Mir.MinimizedState);
+            tryCompare(item, "visible", false);
+
+            surface.requestState(Mir.MaximizedState);
+            tryCompare(item, "visible", true);
+
+            surface.requestState(Mir.MinimizedState);
             tryCompare(item, "visible", false);
         }
 
@@ -2397,7 +2406,7 @@
 
             compare(launcher.lockedVisible, true);
 
-            app.surfaceList.get(0).state = Mir.FullscreenState;
+            app.surfaceList.get(0).requestState(Mir.FullscreenState);
 
             tryCompare(launcher, "lockedVisible", false);
         }
@@ -2584,7 +2593,7 @@
             verify(promptSurface);
             tryCompare(appSurface, "keymap", promptSurface.keymap);
             // ... and that the controller's surface keymap is also the same
-            tryCompare(MirFocusController.focusedSurface, "keymap", "sk");
+            tryCompare(topLevelSurfaceList.focusedSurface, "keymap", "sk");
             app.promptSurfaceList.get(0).close();
 
             // switch to next keymap, should go to "cz+qwerty"
@@ -2702,7 +2711,6 @@
             return [
                 {tag: "no need to displace", windowHeight: units.gu(10), windowY: units.gu(5), targetDisplacement: units.gu(5), oskEnabled: true},
                 {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: PanelState.panelHeight, oskEnabled: true},
-                {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: PanelState.panelHeight, oskEnabled: true},
                 {tag: "osk not on this screen", windowHeight: units.gu(40), windowY: units.gu(10), targetDisplacement: units.gu(10), oskEnabled: false},
             ]
         }
@@ -2714,24 +2722,24 @@
             swipeAwayGreeter();
             shell.oskEnabled = data.oskEnabled;
 
-            var oldOSKState = SurfaceManager.inputMethodSurface.state;
-            SurfaceManager.inputMethodSurface.state = Mir.RestoredState;
+            var oldOSKState = topLevelSurfaceList.inputMethodSurface.state;
+            topLevelSurfaceList.inputMethodSurface.requestState(Mir.RestoredState);
             var appRepeater = findChild(shell, "appRepeater");
             var dashAppDelegate = appRepeater.itemAt(0);
             verify(dashAppDelegate);
             dashAppDelegate.requestedHeight = data.windowHeight;
             dashAppDelegate.requestedY = data.windowY;
-            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
+            topLevelSurfaceList.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
             var initialY = dashAppDelegate.y;
             print("intial", initialY, "panel", PanelState.panelHeight);
             verify(initialY > PanelState.panelHeight);
 
-            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, root.height / 2, root.width, root.height / 2));
+            topLevelSurfaceList.inputMethodSurface.setInputBounds(Qt.rect(0, root.height / 2, root.width, root.height / 2));
             tryCompare(dashAppDelegate, "y", data.targetDisplacement);
 
-            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
+            topLevelSurfaceList.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
             tryCompare(dashAppDelegate, "y", initialY);
-            SurfaceManager.inputMethodSurface.state = oldOSKState;
+            topLevelSurfaceList.inputMethodSurface.requestState(oldOSKState);
         }
 
         function test_cursorHidingWithFullscreenApp() {