← Back to branch summary

~mir-team/mir/trunk

« back to all changes in this revision

Viewing changes to src/server/default_server_configuration.cpp

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2013-04-25 23:50:01 UTC
  • mfrom: (526.2.22 mir1)
  • Revision ID: tarmac-20130425235001-c3b3x2yyb3eldyx1
frontend, shell, tests: surface-states updated to avoid supplying dependencies through public member functions.

Approved by PS Jenkins bot, Chris Halse Rogers, Robert Ancell, Kevin DuBois.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/default_server_configuration.cpp
63
63
#include "mir/default_configuration.h"
64
64
 
65
65
namespace mc = mir::compositor;
 
66
namespace me = mir::events;
66
67
namespace geom = mir::geometry;
67
68
namespace mf = mir::frontend;
68
69
namespace mg = mir::graphics;
109
110
    std::shared_ptr<mc::GraphicBufferAllocator> const buffer_allocator;
110
111
 
111
112
    virtual std::shared_ptr<mir::protobuf::DisplayServer> make_ipc_server(
112
 
        std::shared_ptr<mir::EventSink> const& sink)
 
113
        std::shared_ptr<me::EventSink> const& sink)
113
114
    {
114
115
        return std::make_shared<mf::SessionMediator>(
115
116
            shell,