Merge lp:~alan-griffiths/unity-mir/reduce-coupling-to-mir-surfaces into lp:unity-mir

[Alan Griffiths]

Avoid unnecessary use of mir::surfaces::SurfaceStackModel (which ought to be internal to Mir)

Avoid unnecessary use of mir::surfaces::SurfaceStackModel (which ought to be internal to Mir)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/3

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/142/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

[lp:~alan-griffiths/unity-mir/reduce-coupling-to-mir-surfaces]

136. By Alan Griffiths on 2013-10-24

Avoid unnecessary use of mir::surfaces::SurfaceStackModel (which ought to be internal to Mir).

Approved by Gerry Boland, PS Jenkins bot.

=== modified file 'src/unity-mir/surfacecontroller.cpp'
--- src/unity-mir/surfacecontroller.cpp	2013-10-07 23:59:05 +0000
+++ src/unity-mir/surfacecontroller.cpp	2013-10-24 08:28:08 +0000
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <mir/surfaces/surface_stack_model.h>
 #include <mir/shell/surface_creation_parameters.h> // TODO: Remove ~racarr
 
 #include "surfacecontroller.h"
@@ -51,15 +50,15 @@
         newParams.depth = shellSurfaceDepth;
         newParams.input_mode = mir::input::InputReceptionMode::receives_all_input;        
         shellSurfaceFound = true;
-        return surface_stack->create_surface(newParams);
+        return ms::SurfaceController::create_surface(session, newParams);
     } else if (params.name == "MaliitOnScreenKeyboard") { // FIXME: string hardcoded into maliit
         DLOG("OSK depth");
         auto newParams = params;
         newParams.depth = oskSurfaceDepth;
-        return surface_stack->create_surface(newParams);
+        return ms::SurfaceController::create_surface(session, newParams);
     } else {
         DLOG("Default depth");
-        return surface_stack->create_surface(params);
+        return ms::SurfaceController::create_surface(session, params);
     }
 }