← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to src/server/frontend/default_configuration.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-11-20 16:41:15 UTC
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: package-import@ubuntu.com-20141120164115-a3j4vq6cq2u78m47
Tags: upstream-0.9.0+15.04.20141120.1
Import upstream version 0.9.0+15.04.20141120.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/frontend/default_configuration.cpp
22
22
#include "default_ipc_factory.h"
23
23
#include "published_socket_connector.h"
24
24
 
 
25
#include "unsupported_coordinate_translator.h"
 
26
 
 
27
#include "mir/graphics/platform.h"
25
28
#include "mir/frontend/protobuf_connection_creator.h"
26
29
#include "mir/frontend/session_authorizer.h"
27
30
#include "mir/options/configuration.h"
29
32
 
30
33
namespace mf = mir::frontend;
31
34
namespace mg = mir::graphics;
 
35
namespace ms = mir::scene;
32
36
 
33
37
std::shared_ptr<mf::ConnectionCreator>
34
38
mir::DefaultServerConfiguration::the_connection_creator()
137
141
mir::DefaultServerConfiguration::new_ipc_factory(
138
142
    std::shared_ptr<mf::SessionAuthorizer> const& session_authorizer)
139
143
{
 
144
    std::shared_ptr<ms::CoordinateTranslator> translator;
 
145
    if (the_options()->is_set(options::debug_opt))
 
146
    {
 
147
        translator = the_coordinate_translator();
 
148
    }
 
149
    else
 
150
    {
 
151
        translator = std::make_shared<mf::UnsupportedCoordinateTranslator>();
 
152
    }
140
153
    return std::make_shared<mf::DefaultIpcFactory>(
141
 
        the_frontend_shell(),
142
 
        the_session_mediator_report(),
143
 
        the_graphics_platform(),
144
 
        the_frontend_display_changer(),
145
 
        the_buffer_allocator(),
146
 
        the_screencast(),
147
 
        session_authorizer,
148
 
        the_cursor_images());
 
154
                the_frontend_shell(),
 
155
                the_session_mediator_report(),
 
156
                the_graphics_platform()->make_ipc_operations(),
 
157
                the_frontend_display_changer(),
 
158
                the_buffer_allocator(),
 
159
                the_screencast(),
 
160
                session_authorizer,
 
161
                the_cursor_images(),
 
162
                translator);
149
163
}