Merge lp://staging/~robertcarr/mir/ease-shell-configuration into lp://staging/~mir-team/mir/trunk
Status: | Rejected |
---|---|
Rejected by: | Robert Carr |
Proposed branch: | lp://staging/~robertcarr/mir/ease-shell-configuration |
Merge into: | lp://staging/~mir-team/mir/trunk |
Diff against target: |
813 lines (+393/-110) 12 files modified
include/server/mir/default_server_configuration.h (+3/-0) include/server/mir/shell/default_shell_configuration.h (+71/-0) include/server/mir/shell/session_manager.h (+2/-4) include/server/mir/shell/shell_configuration.h (+52/-0) src/server/default_server_configuration.cpp (+14/-14) src/server/shell/CMakeLists.txt (+1/-0) src/server/shell/default_shell_configuration.cpp (+82/-0) src/server/shell/session_manager.cpp (+8/-11) tests/acceptance-tests/test_focus_selection.cpp (+33/-12) tests/death-tests/test_application_manager_death.cpp (+25/-5) tests/integration-tests/shell/test_session_manager.cpp (+47/-31) tests/unit-tests/shell/test_session_manager.cpp (+55/-33) |
To merge this branch: | bzr merge lp://staging/~robertcarr/mir/ease-shell-configuration |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Needs Fixing | ||
Daniel van Vugt | Abstain | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Alexandros Frantzis (community) | Needs Fixing | ||
Review via email:
|
Commit message
Encapsulate SessionManager dependencies in a ShellConfiguration object (using the idiom established by input)
Description of the change
I want to write a small demo shell which among other things (largely input filtering), replaces the placement strategy. It's a little cumbersome to do so from the shells perspective though! Also the large number of arguments to SessionManager constructor make refactoring a little painful.
This branch refactors it to use the idiom established by the server configuration and input configuration
Unmerged revisions
- 588. By Robert Carr
-
Fix headers
- 587. By Robert Carr
-
Merge trunk
- 586. By Robert Carr
-
Trim whitespace
- 585. By Robert Carr
-
Merge trunk
- 584. By Robert Carr
-
Whitespace
- 583. By Robert Carr
-
~ShellConfiguration is noexcept
- 582. By Robert Carr
-
Add the_shell_
configuration( ) to default server configuration - 581. By Robert Carr
-
Fix copyright headers
- 580. By Robert Carr
-
Merge trunk
- 579. By Robert Carr
-
Factor placement strategy out to a default shell configuration method
PASSED: Continuous integration, rev:579 jenkins. qa.ubuntu. com/job/ mir-ci/ 343/ jenkins. qa.ubuntu. com/job/ mir-android- raring- i386-build/ 327 jenkins. qa.ubuntu. com/job/ mir-clang- raring- amd64-build/ 210 jenkins. qa.ubuntu. com/job/ mir-quantal- amd64-ci/ 348 jenkins. qa.ubuntu. com/job/ mir-quantal- amd64-ci/ 348/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-vm- ci-build/ ./distribution= precise, flavor= amd64/148
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 343/rebuild
http://