← Back to branch summary

~brandontschaefer/mir/first-round-deprecation

« back to all changes in this revision

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

  • Committer: Brandon Schaefer
  • Date: 2016-12-13 17:59:30 UTC
  • mfrom: (3787.1.93 development-branch)
  • Revision ID: brandon.schaefer@canonical.com-20161213175930-j9o7qn0b11n3kzlm
* Merge trunk, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/scene/mediating_display_changer.h
42
42
{
43
43
    class Display;
44
44
    class DisplayConfigurationPolicy;
45
 
    class DisplayConfigurationReport;
 
45
    class DisplayConfigurationObserver;
46
46
}
47
47
namespace compositor { class Compositor; }
48
48
namespace input
67
67
        std::shared_ptr<SessionContainer> const& session_container,
68
68
        std::shared_ptr<SessionEventHandlerRegister> const& session_event_handler_register,
69
69
        std::shared_ptr<ServerActionQueue> const& server_action_queue,
70
 
        std::shared_ptr<graphics::DisplayConfigurationReport> const& report,
 
70
        std::shared_ptr<graphics::DisplayConfigurationObserver> const& observer,
71
71
        std::shared_ptr<input::InputRegion> const& region,
72
72
        std::shared_ptr<time::AlarmFactory> const& alarm_factory);
73
73
 
113
113
    std::shared_ptr<SessionContainer> const session_container;
114
114
    std::shared_ptr<SessionEventHandlerRegister> const session_event_handler_register;
115
115
    std::shared_ptr<ServerActionQueue> const server_action_queue;
116
 
    std::shared_ptr<graphics::DisplayConfigurationReport> const report;
 
116
    std::shared_ptr<graphics::DisplayConfigurationObserver> const observer;
117
117
    std::mutex configuration_mutex;
118
118
    std::map<std::weak_ptr<frontend::Session>,
119
119
             std::shared_ptr<graphics::DisplayConfiguration>,