Moves mash/wm into ash/mus

ash/mus/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/ui.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/repack.gni")
 
@@ skipping 64 matching lines @@
     "user_window_controller_impl.cc",
     "user_window_controller_impl.h",
     "window_manager.cc",
     "window_manager.h",
     "window_manager_application.cc",
     "window_manager_application.h",
   ]
 
   public_deps = [
     "//ash",
+    "//ash/mus/resources",
     "//ash/public/interfaces",
     "//base",
     "//components/mus/common:mus_common",
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
     "//mash/session/public/interfaces",
-    "//mash/wm/resources",
     "//mojo/common:common_base",
     "//services/shell/public/cpp",
     "//services/tracing/public/cpp",
     "//skia",
     "//ui/aura",
     "//ui/display/mojo",
     "//ui/events",
     "//ui/events/mojo",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
   ]
 }
 
-mojo_native_application("wm") {
+mojo_native_application("mus") {
   output_name = "desktop_wm"

[msw, 2016/06/02 20:28:34]

We probably ought to rename this sometime... not now.

[sky, 2016/06/02 21:31:51]

Yep. I plan on renaming to ash.

 
   sources = [
     "main.cc",
   ]
 
   deps = [
     ":lib",
     ":resources",
     "//services/shell/public/cpp",
   ]
 
   # TODO(beng): This target relies on //mash/session, but there is a cycle so we
   #             can't state that dependency here.
   data_deps = [
     ":manifest",
     "//components/mus",
   ]
 
-  resources = [ "$root_out_dir/mash_wm_resources.pak" ]
+  resources = [ "$root_out_dir/ash_mus_resources.pak" ]
 }
 
 mojo_application_manifest("manifest") {
   application_name = "desktop_wm"
   source = "manifest.json"
 }
 
 repack("resources") {
   sources = [
-    "$root_gen_dir/mash/wm/resources/mash_wm_resources_100_percent.pak",
+    "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
     "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak",
   ]
-  output = "$root_out_dir/mash_wm_resources.pak"
+  output = "$root_out_dir/ash_mus_resources.pak"
   deps = [
-    "//mash/wm/resources",
+    "//ash/mus/resources",
     "//ui/resources",
     "//ui/strings",
     "//ui/views/mus:resources",
     "//ui/views/resources",
   ]
 }
 
 source_set("unittests") {
   testonly = true
 
@@ skipping 33 matching lines @@
     "//ui/display",
     "//ui/events",
     "//ui/events/mojo",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",
     "//ui/views/mus",
   ]
 
   data_deps = [
-    ":wm",
+    ":mus",
     "//mash/quick_launch",
   ]
 }