@@ -156,7 +156,7 @@ FocusScope {
156156
157157 onTouchXChanged: {
158158 if (status == DirectionalDragArea.Recognized) {
159− if (SurfaceManager.empty) {
159+ if (ApplicationManager.empty) {
160160 progress = Math.max(stages.width - stagesDragArea.width + touchX, stages.width * .3);
161161 } else {
162162 progress = stages.width - stagesDragArea.width + touchX;
@@ -166,7 +166,7 @@ FocusScope {
166166
167167 onDraggingChanged: {
168168 if (!dragging) {
169− if (!SurfaceManager.empty && progress < stages.width - units.gu(10)) {
169+ if (!ApplicationManager.empty && progress < stages.width - units.gu(10)) {
170170 stages.show();
171171 }
172172 stagesDragArea.progress = Qt.binding(function () { return stages.width; });
@@ -189,8 +189,8 @@ FocusScope {
189189 property bool shown: false
190190 onShownChanged: {
191191 if (shown) {
192− if (SurfaceManager.topmostSurface) {
193− ApplicationManager.focusApplication(SurfaceManager.topmostSurface.application.appId);
192+ if (ApplicationManager.topmostApplication) {
193+ ApplicationManager.focusApplication(ApplicationManager.topmostApplication.appId);
194194 }
195195 } else {
196196 if (ApplicationManager.focusedApplicationId) {
@@ -440,11 +440,11 @@ FocusScope {
440440 contentEnabled: edgeDemo.panelContentEnabled
441441 }
442442
443− property bool topmostSurfaceIsFullscreen:
444− SurfaceManager.topmostSurface &&
445− SurfaceManager.topmostSurface.state === MirSurfaceItem.Fullscreen
443+ property bool topmostApplicationIsFullscreen:
444+ ApplicationManager.topmostApplication &&
445+ ApplicationManager.topmostApplication.fullscreen
446446
447− fullscreenMode: stages.roughlyFullyShown && topmostSurfaceIsFullscreen
447+ fullscreenMode: stages.roughlyFullyShown && topmostApplicationIsFullscreen
448448 && !greeter.shown && !lockscreen.shown
449449
450450 searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable