← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Alexandros Frantzis
  • Date: 2015-10-08 16:12:19 UTC
  • mto: This revision was merged to the branch mainline in revision 109.
  • Revision ID: package-import@ubuntu.com-20151008161219-emk4a1ys51yy0wjb
Tags: upstream-0.17.0+15.10.20151008.2
Import upstream version 0.17.0+15.10.20151008.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/scene/default_configuration.cpp
24
24
#include "mir/input/scene.h"
25
25
#include "mir/abnormal_exit.h"
26
26
#include "mir/scene/session.h"
 
27
#include "mir/shell/display_configuration_controller.h"
27
28
 
28
29
#include "broadcasting_session_event_sink.h"
29
30
#include "default_session_container.h"
41
42
#include "timeout_application_not_responding_detector.h"
42
43
#include "mir/options/program_option.h"
43
44
#include "mir/options/default_configuration.h"
 
45
#include "mir/graphics/display_configuration.h"
 
46
#include "mir/frontend/display_changer.h"
44
47
 
45
48
namespace mc = mir::compositor;
46
49
namespace mf = mir::frontend;
47
50
namespace mi = mir::input;
48
51
namespace ms = mir::scene;
 
52
namespace mg = mir::graphics;
49
53
namespace msh = mir::shell;
50
54
 
51
55
std::shared_ptr<ms::SurfaceStackModel>
177
181
                    the_snapshot_strategy(),
178
182
                    the_session_event_sink(),
179
183
                    the_session_listener(),
 
184
                    the_display(),
180
185
                    the_application_not_responding_detector());
181
186
        });
182
187
}
236
241
                *the_main_loop(), 1s);
237
242
        });
238
243
}
 
244
 
 
245
std::shared_ptr<msh::DisplayConfigurationController>
 
246
mir::DefaultServerConfiguration::the_display_configuration_controller()
 
247
{
 
248
    return the_mediating_display_changer();
 
249
}