← Back to branch summary

~mterry/mir/session-for-surface

« back to all changes in this revision

Viewing changes to src/server/default_server_configuration.cpp

  • Committer: Daniel van Vugt
  • Date: 2013-04-24 05:22:20 UTC
  • mfrom: (628 trunk)
  • mto: This revision was merged to the branch mainline in revision 629.
  • Revision ID: daniel.van.vugt@canonical.com-20130424052220-qhpyhw2resxzr7bq
Merge latest lp:mir

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/default_server_configuration.cpp
108
108
    std::shared_ptr<mg::ViewableArea> const graphics_display;
109
109
    std::shared_ptr<mc::GraphicBufferAllocator> const buffer_allocator;
110
110
 
111
 
    virtual std::shared_ptr<mir::protobuf::DisplayServer> make_ipc_server()
 
111
    virtual std::shared_ptr<mir::protobuf::DisplayServer> make_ipc_server(
 
112
        std::shared_ptr<mir::EventSink> const& sink)
112
113
    {
113
114
        return std::make_shared<mf::SessionMediator>(
114
115
            shell,
116
117
            graphics_display,
117
118
            buffer_allocator,
118
119
            sm_report,
 
120
            sink,
119
121
            resource_cache());
120
122
    }
121
123