← Back to branch summary

~raof/mir/wl-implement-bare-minimum-fullscreen

« back to all changes in this revision

Viewing changes to tests/mir_test_framework/async_server_runner.cpp

  • Committer: Christopher James Halse Rogers
  • Date: 2017-09-07 05:58:13 UTC
  • mfrom: (4154.58.29 development-branch)
  • Revision ID: christopher.halse.rogers@canonical.com-20170907055813-4qsg25nirybc8jj3
Merge trunk, resolving conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mir_test_framework/async_server_runner.cpp
24
24
#include "mir/geometry/rectangle.h"
25
25
#include "mir/options/option.h"
26
26
#include "mir/test/doubles/null_logger.h"
 
27
#include <mir/shell/canonical_window_manager.h>
27
28
 
28
29
#include <boost/throw_exception.hpp>
29
30
 
31
32
 
32
33
namespace geom = mir::geometry;
33
34
namespace ml = mir::logging;
 
35
namespace msh = mir::shell;
34
36
namespace mtd = mir::test::doubles;
35
37
namespace mtf = mir_test_framework;
36
38
namespace mt = mir::test;
54
56
 
55
57
            return result;
56
58
        });
 
59
    server.override_the_window_manager_builder([this](msh::FocusController* focus_controller)
 
60
        {
 
61
#pragma GCC diagnostic push
 
62
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
63
            return std::make_shared<msh::CanonicalWindowManager>(
 
64
                    focus_controller,
 
65
                    server.the_shell_display_layout());
 
66
#pragma GCC diagnostic pop
 
67
        });
57
68
}
58
69
 
59
70
void mtf::AsyncServerRunner::add_to_environment(char const* key, char const* value)