lp:~robertcarr/mir/prepare-session-manager-for-input-focus

Branch merges

Propose for merging

No branches dependent on this one.

Superseded for merging into lp:~mir-team/mir/trunk

Alan Griffiths: Needs Fixing on 2013-03-13

PS Jenkins bot (community): Approve (continuous-integration) on 2013-03-12

Diff: 854 lines (+328/-73)

20 files modified

include/mir/shell/application_session.h (+6/-1)
include/mir/shell/focus_arbitrator.h (+47/-0)
include/mir/shell/session.h (+3/-1)
include/mir/shell/session_manager.h (+2/-0)
include/mir/shell/session_store.h (+5/-1)
include/mir_test_doubles/mock_session.h (+2/-0)
include/mir_test_doubles/mock_session_store.h (+2/-0)
include/mir_test_doubles/stub_session.h (+4/-0)
include/mir_test_doubles/stub_session_store.h (+4/-0)
src/shell/application_session.cpp (+13/-0)
src/shell/session_manager.cpp (+10/-1)
tests/acceptance-tests/test_focus_management_api.cpp (+5/-0)
tests/integration-tests/CMakeLists.txt (+1/-0)
tests/integration-tests/frontend/CMakeLists.txt (+0/-1)
tests/integration-tests/shell/CMakeLists.txt (+9/-0)
tests/integration-tests/shell/test_session_manager.cpp (+64/-0)
tests/unit-tests/shell/test_application_session.cpp (+95/-23)
tests/unit-tests/shell/test_registration_order_focus_sequence.cpp (+18/-26)
tests/unit-tests/shell/test_session_manager.cpp (+22/-2)
tests/unit-tests/shell/test_the_session_container_implementation.cpp (+16/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

485. By Robert Carr on 2013-03-12

Reduce obtusity of test name

484. By Robert Carr on 2013-03-12

test_session_manager.cpp: Replace a should be stub mock with a stub

483. By Robert Carr on 2013-03-12

Remove overzealous whitespace deletion

482. By Robert Carr on 2013-03-12

Merge reduce-coupling-in-application-mediator-test

481. By Robert Carr on 2013-03-12

focus_arbitrator.h: Fix misnamed header guard comment

480. By Robert Carr on 2013-03-12

Implement request_focus, allowing the integration test to pass

479. By Robert Carr on 2013-03-12

Failing unit test to define SessionManager::request_focus

478. By Robert Carr on 2013-03-11

Pass application session to focus arbitrator through std::enable_shared_from_this

477. By Robert Carr on 2013-03-11

Define new msh::Session attribute has_appeared (see, ApplicationSession, session_has_appeared_after_creating_surface)

476. By Robert Carr on 2013-03-11

Hook the session manager up to the session via focus arbitrator