← Back to branch summary

~alan-griffiths/mir/move-more-stuff-to-scene

~alan-griffiths/mir/move-more-stuff-to-scene

Viewing all changes in revision 1540.

Committer: Alan Griffiths
Date: 2014-04-07 16:38:17 UTC
mfrom: (1534.1.8 mir1)
Revision ID: alan@octopull.co.uk-20140407163817-zbh15rkpc0g0r96x

merge lp:~alan-griffiths/mir/scene-grabs-Session-and-SessionListener

files renamed:
include/server/mir/shell/null_session_listener.h => include/server/mir/scene/null_session_listener.h

include/server/mir/shell/session.h => include/server/mir/scene/session.h

include/server/mir/shell/session_listener.h => include/server/mir/scene/session_listener.h

include/test/mir_test_doubles/mock_shell_session.h => include/test/mir_test_doubles/mock_scene_session.h

include/test/mir_test_doubles/stub_shell_session.h => include/test/mir_test_doubles/stub_scene_session.h

files modified:
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/demo-shell/fullscreen_placement_strategy.cpp

examples/demo-shell/fullscreen_placement_strategy.h

examples/demo-shell/window_manager.cpp

include/server/mir/default_server_configuration.h

include/server/mir/scene/surface_coordinator.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/focus_setter.h

include/server/mir/shell/placement_strategy.h

include/test/mir_test_doubles/mock_focus_setter.h

include/test/mir_test_doubles/mock_session_listener.h

include/test/mir_test_doubles/null_session_event_sink.h

include/test/mir_test_framework/declarative_placement_strategy.h

src/server/default_server_configuration.cpp

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/broadcasting_session_event_sink.cpp

src/server/scene/broadcasting_session_event_sink.h

src/server/scene/default_configuration.cpp

src/server/scene/default_session_container.cpp

src/server/scene/default_session_container.h

src/server/scene/global_event_sender.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/session_container.h

src/server/scene/session_event_handler_register.h

src/server/scene/session_event_sink.h

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/consuming_placement_strategy.h

src/server/shell/default_focus_mechanism.cpp

src/server/shell/default_focus_mechanism.h

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/integration-tests/shell/test_session_lifecycle_event.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_session_manager.cpp

tests/mir_test_framework/declarative_placement_strategy.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_broadcasting_session_event_sink.cpp

tests/unit-tests/scene/test_default_focus_mechanism.cpp

tests/unit-tests/scene/test_global_event_sender.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface_controller.cpp

tests/unit-tests/scene/test_the_session_container_implementation.cpp

tests/unit-tests/shell/test_consuming_placement_strategy.cpp

tests/unit-tests/shell/test_mediating_display_changer.cpp

Show diffs side-by-side

added added

removed removed

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/demo-shell/fullscreen_placement_strategy.cpp

examples/demo-shell/fullscreen_placement_strategy.h

examples/demo-shell/window_manager.cpp

include/server/mir/default_server_configuration.h

include/server/mir/scene/null_session_listener.h

include/server/mir/scene/session.h

include/server/mir/scene/session_listener.h

include/server/mir/scene/surface_coordinator.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/focus_setter.h

include/server/mir/shell/placement_strategy.h

include/test/mir_test_doubles/mock_focus_setter.h

include/test/mir_test_doubles/mock_scene_session.h

include/test/mir_test_doubles/mock_session_listener.h

include/test/mir_test_doubles/null_session_event_sink.h

include/test/mir_test_doubles/stub_scene_session.h

include/test/mir_test_framework/declarative_placement_strategy.h

src/server/default_server_configuration.cpp

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/broadcasting_session_event_sink.cpp

src/server/scene/broadcasting_session_event_sink.h

src/server/scene/default_configuration.cpp

src/server/scene/default_session_container.cpp

src/server/scene/default_session_container.h

src/server/scene/global_event_sender.cpp

src/server/scene/mediating_display_changer.cpp

src/server/scene/session_container.h

src/server/scene/session_event_handler_register.h

src/server/scene/session_event_sink.h

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/consuming_placement_strategy.h

src/server/shell/default_focus_mechanism.cpp

src/server/shell/default_focus_mechanism.h

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/integration-tests/shell/test_session_lifecycle_event.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_session_manager.cpp

tests/mir_test_framework/declarative_placement_strategy.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_broadcasting_session_event_sink.cpp

tests/unit-tests/scene/test_default_focus_mechanism.cpp

tests/unit-tests/scene/test_global_event_sender.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface_controller.cpp

tests/unit-tests/scene/test_the_session_container_implementation.cpp

tests/unit-tests/shell/test_consuming_placement_strategy.cpp

tests/unit-tests/shell/test_mediating_display_changer.cpp

Older »