Moves mash/wm into ash/mus

ash/mus/container_ids.h

Index: ash/mus/container_ids.h
diff --git a/mash/wm/container_ids.h b/ash/mus/container_ids.h
similarity index 60%
rename from mash/wm/container_ids.h
rename to ash/mus/container_ids.h
index 7d889d283c05c5eea68bf6ed9410c6940f15c6dc..cc6edc752d5bdc15188655872ac9b054147fc16a 100644
--- a/mash/wm/container_ids.h
+++ b/ash/mus/container_ids.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_CONTAINER_IDS_H_
-#define MASH_WM_CONTAINER_IDS_H_
+#ifndef ASH_MUS_CONTAINER_IDS_H_
+#define ASH_MUS_CONTAINER_IDS_H_
 
 #include <stddef.h>
 
@@ -11,25 +11,23 @@ namespace ash {
 namespace mojom {
 enum class Container;
 }
-}
 
-namespace mash {
-namespace wm {
+namespace mus {
 // Id used when there is no corresponding ash container.
 const int kUnknownAshId = -1;
 
 // The set of containers that allow their children to be active.
-extern const ash::mojom::Container kActivationContainers[];
+extern const mojom::Container kActivationContainers[];
 
 // Number of kActivationContainers.
 extern const size_t kNumActivationContainers;
 
 // Converts window ids between ash (ash/common/shell_window_ids.h) and
 // mash.
-ash::mojom::Container AshContainerToMashContainer(int shell_window_id);
-int MashContainerToAshContainer(ash::mojom::Container container);
+mojom::Container AshContainerToMashContainer(int shell_window_id);
+int MashContainerToAshContainer(mojom::Container container);
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_CONTAINER_IDS_H_
+#endif  // ASH_MUS_CONTAINER_IDS_H_