← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/server/scene/mediating_display_changer.h

  • 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/mediating_display_changer.h
21
21
 
22
22
#include "mir/frontend/display_changer.h"
23
23
#include "mir/display_changer.h"
 
24
#include "mir/shell/display_configuration_controller.h"
24
25
 
25
26
#include <mutex>
26
27
#include <map>
43
44
class Session;
44
45
 
45
46
class MediatingDisplayChanger : public frontend::DisplayChanger,
46
 
                                public mir::DisplayChanger
 
47
                                public mir::DisplayChanger,
 
48
                                public shell::DisplayConfigurationController
47
49
{
48
50
public:
49
51
    MediatingDisplayChanger(
68
70
    void pause_display_config_processing() override;
69
71
    void resume_display_config_processing() override;
70
72
 
 
73
    /* From shell::DisplayConfigurationController */
 
74
    std::future<void> set_default_display_configuration(
 
75
        std::shared_ptr<graphics::DisplayConfiguration> const &conf) override;
 
76
 
71
77
private:
72
78
    void focus_change_handler(std::shared_ptr<Session> const& session);
73
79
    void no_focus_handler();