← Back to branch summary

~robertcarr/mir/client-focus-notifications

« back to all changes in this revision

Viewing changes to src/server/shell/application_session.cpp

  • Committer: Robert Carr
  • Date: 2013-08-01 22:01:20 UTC
  • mfrom: (706.2.208 trunk)
  • Revision ID: robert.carr@canonical.com-20130801220120-6m230b3g6x0xflzd
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/shell/application_session.cpp
29
29
#include <cassert>
30
30
#include <algorithm>
31
31
 
32
 
namespace me = mir::events;
33
32
namespace mf = mir::frontend;
34
33
namespace msh = mir::shell;
35
34
 
38
37
    std::string const& session_name,
39
38
    std::shared_ptr<SnapshotStrategy> const& snapshot_strategy,
40
39
    std::shared_ptr<msh::SessionListener> const& session_listener,
41
 
    std::shared_ptr<me::EventSink> const& sink) :
 
40
    std::shared_ptr<mf::EventSink> const& sink) :
42
41
    surface_factory(surface_factory),
43
42
    session_name(session_name),
44
43
    snapshot_strategy(snapshot_strategy),
49
48
    assert(surface_factory);
50
49
}
51
50
 
52
 
msh::ApplicationSession::ApplicationSession(
53
 
    std::shared_ptr<SurfaceFactory> const& surface_factory,
54
 
    std::string const& session_name,
55
 
    std::shared_ptr<SnapshotStrategy> const& snapshot_strategy,
56
 
    std::shared_ptr<msh::SessionListener> const& session_listener) :
57
 
    ApplicationSession(surface_factory, session_name, snapshot_strategy, session_listener, std::shared_ptr<me::EventSink>())
58
 
{
59
 
}
60
 
 
61
51
msh::ApplicationSession::~ApplicationSession()
62
52
{
63
53
    std::unique_lock<std::mutex> lock(surfaces_mutex);