Use prefer layout over layoutService

Author: pichfl

app/controllers/application.js

@@ -13,7 +13,7 @@ export default class ApplicationController extends Controller {
    * Service used to broadcast changes to the application's layout
    * such as toggling of the object inspector.
    */
-  @service('layout') layoutService;
+  @service layout;
   @service port;
 
   // Indicates that the extension window is focused,
@@ -84,22 +84,20 @@ export default class ApplicationController extends Controller {
   @action
   setupContentElement(element) {
     this.contentElement = element;
-    this.layoutService.updateContentHeight(this.contentElement.clientHeight);
+    this.layout.updateContentHeight(this.contentElement.clientHeight);
   }
 
   @action
   _windowDidResize() {
     // eslint-disable-next-line ember/no-runloop
     schedule('afterRender', () => {
       if (!this.isDestroyed && !this.isDestroying) {
-        this.layoutService.trigger('resize', {
+        this.layout.trigger('resize', {
           source: 'application-controller',
         });
 
         if (this.contentElement) {
-          this.layoutService.updateContentHeight(
-            this.contentElement.clientHeight,
-          );
+          this.layout.updateContentHeight(this.contentElement.clientHeight);
         }
       }
     });
@@ -116,7 +114,7 @@ export default class ApplicationController extends Controller {
     this.navIsCollapsed = !this.navIsCollapsed;
     // eslint-disable-next-line ember/no-runloop
     schedule('afterRender', () => {
-      this.layoutService.trigger('resize', { source: 'navigation' });
+      this.layout.trigger('resize', { source: 'navigation' });
     });
   }
 

app/routes/application.js

@@ -9,7 +9,7 @@ export default class ApplicationRoute extends Route {
   @service adapter;
   @service port;
   @service router;
-  @service('layout') layoutService;
+  @service layout;
 
   setupController(controller) {
     controller.set('mixinStack', []);
@@ -65,7 +65,7 @@ export default class ApplicationRoute extends Route {
       controller.activateMixinDetails(name, objectId, details, errors);
     }
 
-    this.layoutService.showInspector();
+    this.layout.showInspector();
   }
 
   setDeprecationCount(message) {

app/templates/application.hbs

@@ -47,9 +47,9 @@
           <div class="split-panel">
             <div class="split-panel-hd split-panel-hd-row">
               <div id="toolbar"></div>
-              {{#if (not this.layoutService.inspectorExpanded)}}
+              {{#unless this.layout.inspectorExpanded}}
                 <ObjectInspector::Toggle class="end" />
-              {{/if}}
+              {{/unless}}
             </div>
 
             <div class="split-panel-bd" {{did-insert this.setupContentElement}}>
@@ -59,7 +59,7 @@
         </div>
       </div>
 
-      {{#if this.layoutService.inspectorExpanded}}
+      {{#if this.layout.inspectorExpanded}}
         <Ui::DraggableColumn
           @classes="split-panel"
           @side="right"