← Back to branch summary

~lukas-kde/qtmir/betterSessionManagement

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/application_manager.h

  • Committer: Gerry Boland
  • Date: 2017-03-24 11:29:56 UTC
  • mfrom: (590.1.35 qtmir)
  • mto: (590.24.1 keyState)
  • mto: This revision was merged to the branch mainline in revision 596.
  • Revision ID: gerry.boland@canonical.com-20170324112956-pwlzbn3jw43879ly
Merge trunk & fix build failure

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/application_manager.h
26
26
 
27
27
// local
28
28
#include "application.h"
 
29
#include "sessionmap_interface.h"
29
30
#include "taskcontroller.h"
30
31
 
31
32
// Unity API
55
56
class SharedWakelock;
56
57
class SettingsInterface;
57
58
 
58
 
class ApplicationManager : public unity::shell::application::ApplicationManagerInterface
 
59
class ApplicationManager : public unity::shell::application::ApplicationManagerInterface,
 
60
                           public SessionMapInterface
59
61
{
60
62
    Q_OBJECT
61
63
 
94
96
    const QList<Application*> &list() const { return m_applications; }
95
97
    qtmir::Application* findApplicationWithPid(const pid_t pid) const;
96
98
 
97
 
    SessionInterface *findSession(const mir::scene::Session* session) const;
 
99
    SessionInterface *findSession(const mir::scene::Session* session) const override;
98
100
 
99
101
public Q_SLOTS:
100
102
    void authorizeSession(const pid_t pid, bool &authorized);