Merge lp:~alan-griffiths/mir/proving-still-uses-DefaultWindowManager into lp:mir

[Alan Griffiths]

playground: the proving server still needs to use DefaultWindowManager
Fixes LP: #1438621, LP: #1438660

playground: the proving server still needs to use DefaultWindowManager

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2444
http://jenkins.qa.ubuntu.com/job/mir-ci/3411/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1894
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1845/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1408
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1408/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1845
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1845/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4798/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19302

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3411/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

lp:1438702

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2445
http://jenkins.qa.ubuntu.com/job/mir-ci/3413/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1410
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1847
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1847/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4800
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19310

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3413/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

A curiously simple fix... Verified in manual testing both bugs are fixed.

review: Approve

=== modified file 'playground/demo-shell/demo_shell.cpp'
--- playground/demo-shell/demo_shell.cpp	2015-03-31 12:48:35 +0000
+++ playground/demo-shell/demo_shell.cpp	2015-03-31 14:14:00 +0000
@@ -29,6 +29,7 @@
 #include "mir/compositor/display_buffer_compositor_factory.h"
 #include "mir/compositor/destination_alpha.h"
 #include "mir/compositor/renderer_factory.h"
+#include "mir/shell/default_window_manager.h"
 #include "server_example_host_lifecycle_event_listener.h"
 
 #include <iostream>
@@ -100,6 +101,16 @@
             });
     }
 
+    auto the_window_manager_builder() -> shell::WindowManagerBuilder override
+    {
+        return [&](shell::FocusController* focus_controller)
+            { return std::make_shared<shell::DefaultWindowManager>(
+                focus_controller,
+                the_placement_strategy(),
+                the_session_coordinator(),
+                the_surface_configurator()); };
+    }
+
     std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override
     {
        return host_lifecycle_event_listener(

=== renamed file 'src/server/shell/default_window_manager.h' => 'src/include/server/mir/shell/default_window_manager.h'
=== modified file 'src/server/shell/default_window_manager.cpp'
--- src/server/shell/default_window_manager.cpp	2015-03-31 02:35:42 +0000
+++ src/server/shell/default_window_manager.cpp	2015-03-31 14:14:00 +0000
@@ -16,7 +16,7 @@
  * Authored By: Alan Griffiths <[e-mail]>
  */
 
-#include "default_window_manager.h"
+#include "mir/shell/default_window_manager.h"
 
 #include "mir/scene/null_surface_observer.h"
 #include "mir/scene/placement_strategy.h"

=== modified file 'tests/integration-tests/test_default_window_manager.cpp'
--- tests/integration-tests/test_default_window_manager.cpp	2015-03-31 02:35:42 +0000
+++ tests/integration-tests/test_default_window_manager.cpp	2015-03-31 14:14:00 +0000
@@ -20,8 +20,8 @@
 #include "mir/scene/session.h"
 #include "mir/scene/null_session_listener.h"
 #include "mir/scene/placement_strategy.h"
+#include "mir/shell/default_window_manager.h"
 
-#include "src/server/shell/default_window_manager.h"
 #include "src/server/scene/session_manager.h"
 #include "src/server/scene/default_session_container.h"
 

=== modified file 'tests/mir_test_framework/fake_event_hub_server_configuration.cpp'
--- tests/mir_test_framework/fake_event_hub_server_configuration.cpp	2015-03-31 02:35:42 +0000
+++ tests/mir_test_framework/fake_event_hub_server_configuration.cpp	2015-03-31 14:14:00 +0000
@@ -21,7 +21,7 @@
 
 #include "mir_test/fake_event_hub.h"
 
-#include "src/server/shell/default_window_manager.h"
+#include "mir/shell/default_window_manager.h"
 
 namespace mtf = mir_test_framework;
 namespace mi = mir::input;

=== modified file 'tests/unit-tests/shell/test_default_window_manager.cpp'
--- tests/unit-tests/shell/test_default_window_manager.cpp	2015-03-31 02:35:42 +0000
+++ tests/unit-tests/shell/test_default_window_manager.cpp	2015-03-31 14:14:00 +0000
@@ -16,7 +16,7 @@
  * Authored by: ALan Griffiths <[e-mail]>
  */
 
-#include "src/server/shell/default_window_manager.h"
+#include "mir/shell/default_window_manager.h"
 
 #include "mir/shell/abstract_shell.h"
 #include "mir/scene/session.h"