chromeos: Makes mushrome use simplified display management

mash/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/nacl/config.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
 # Target that builders build.
 group("all") {
   testonly = true
 
   deps = [
     ":mash_catalog",
     "//components/leveldb",
     "//mash/catalog_viewer",
     "//mash/example",
     "//mash/quick_launch",
     "//mash/runner",
     "//mash/session",
     "//mash/simple_wm",
     "//mash/task_viewer",
   ]
 
   # Build on platforms that support ash.
   if (is_chromeos) {
     deps += [
       "//ash/autoclick/mus:accessibility_autoclick",
+      "//ash/mus/standalone:standalone_ash",
       "//ash/touch_hud/mus:touch_hud",
       "//mash:mash_unittests",
     ]
   }
 }
 
 # This is the catalog of services available to a standalone mash environment.
 # Build //mash/runner to generate the runner executable.
 catalog("catalog") {
   testonly = true
@@ skipping 22 matching lines @@
     "//chrome/app:chrome_content_plugin_manifest",
     "//chrome/app:chrome_content_renderer_manifest",
     "//chrome/app:chrome_content_utility_manifest",
   ]
 
   executable_overrides = [ "content_packaged_services:@EXE_DIR/chrome" ]
 
   catalog_deps = [ "//mash/example:catalog" ]
 
   if (is_chromeos) {
-    standalone_services += [ "//ash/mus:manifest" ]
+    standalone_services += [
+      "//ash/mus:manifest",
+      "//ash/mus/standalone:manifest",
+    ]
   }
 
   if (is_linux && !is_android) {
     standalone_services += [ "//components/font_service:manifest" ]
   }
 
   if (enable_nacl) {
     standalone_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
     if (is_win && target_cpu == "x86") {
       standalone_services += [ "//components/nacl/broker:nacl_broker_manifest" ]
@@ skipping 70 matching lines @@
     testonly = true
     sources = get_target_outputs(":mash_unittests_catalog")
     outputs = [
       "${root_out_dir}/mash_unittests_catalog.json",
     ]
     deps = [
       ":mash_unittests_catalog",
     ]
   }
 }