← Back to branch summary

~mir-team/unity-system-compositor/toggle-cursor2

« back to all changes in this revision

Viewing changes to src/server.cpp

Use the new mir::shell::WindowManager interface instead of wrapping the default shell.

Approved by Alexandros Frantzis, Kevin DuBois, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server.cpp
18
18
 
19
19
#include "server.h"
20
20
#include "external_spinner.h"
21
 
#include "shell.h"
22
21
#include "asio_dm_connection.h"
23
22
#include "session_switcher.h"
 
23
#include "window_manager.h"
24
24
#include "powerd_mediator.h"
25
25
 
26
26
#include <mir/input/cursor_listener.h>
127
127
            return std::make_shared<ServerStatusListener>(the_focus_controller());
128
128
        });
129
129
 
130
 
    wrap_shell([this](std::shared_ptr<msh::Shell> const& wrapped)
131
 
        -> std::shared_ptr<msh::Shell>
132
 
        {
133
 
            return std::make_shared<Shell>(wrapped, the_session_switcher());
134
 
        });
 
130
    override_the_window_manager_builder([this](msh::FocusController* focus_controller)
 
131
       {
 
132
         return std::make_shared<WindowManager>(
 
133
             focus_controller,
 
134
             the_shell_display_layout(),
 
135
             the_session_coordinator(),
 
136
             the_session_switcher());
 
137
       });
135
138
 
136
139
    set_config_filename("unity-system-compositor.conf");
137
140