~alan-griffiths/mir/fix-1716436

« back to all changes in this revision

Viewing changes to tests/mir_test_framework/headless_in_process_server.cpp

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2017-09-05 18:26:04 UTC
  • mfrom: (4234.1.5 mir3)
  • Revision ID: tarmac-20170905182604-ohwyi3l6tnwukic5
Remove unused window management support from libmirserver.

Approved by mir-ci-bot, Gerry Boland, Chris Halse Rogers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
#include "mir_test_framework/headless_in_process_server.h"
20
20
#include "mir_test_framework/stub_server_platform_factory.h"
 
21
#include <mir/shell/canonical_window_manager.h>
21
22
 
22
23
namespace mtf = mir_test_framework;
 
24
namespace msh = mir::shell;
23
25
 
24
26
mtf::HeadlessInProcessServer::HeadlessInProcessServer()
25
27
{
26
28
    add_to_environment("MIR_SERVER_NO_FILE", "");
 
29
 
 
30
    server.override_the_window_manager_builder([this](msh::FocusController* focus_controller)
 
31
        {
 
32
#pragma GCC diagnostic push
 
33
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
34
            return std::make_shared<msh::CanonicalWindowManager>(
 
35
                    focus_controller,
 
36
                    server.the_shell_display_layout());
 
37
#pragma GCC diagnostic pop
 
38
        });
27
39
}
28
40
 
29
41
void mtf::HeadlessInProcessServer::SetUp()