Moves mash/wm into ash/mus

ash/mus/container_ids.cc

Index: ash/mus/container_ids.cc
diff --git a/mash/wm/container_ids.cc b/ash/mus/container_ids.cc
similarity index 72%
rename from mash/wm/container_ids.cc
rename to ash/mus/container_ids.cc
index 8e9fb36640aca2d8f0f575301b8aff7ac43d7d94..3d95fea3db3e0143f12f1aa4df02e27ec6098539 100644
--- a/mash/wm/container_ids.cc
+++ b/ash/mus/container_ids.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/container_ids.h"
+#include "ash/mus/container_ids.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/public/interfaces/container.mojom.h"
 
 using ash::mojom::Container;
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 const Container kActivationContainers[] = {
     // TODO(sky): figure out right set of containers. I suspect this should be
@@ -30,38 +30,38 @@ const size_t kNumActivationContainers = arraysize(kActivationContainers);
 
 Container AshContainerToMashContainer(int ash_id) {
   switch (ash_id) {
-    case ash::kShellWindowId_UnparentedControlContainer:
-    case ash::kShellWindowId_LockScreenContainer:
-    case ash::kShellWindowId_LockSystemModalContainer:
+    case kShellWindowId_UnparentedControlContainer:
+    case kShellWindowId_LockScreenContainer:
+    case kShellWindowId_LockSystemModalContainer:
       // We should never be asked to parent windows of these types.
       NOTREACHED();
       return Container::USER_PRIVATE;
 
-    case ash::kShellWindowId_DefaultContainer:
+    case kShellWindowId_DefaultContainer:
       return Container::USER_PRIVATE_WINDOWS;
 
-    case ash::kShellWindowId_AlwaysOnTopContainer:
+    case kShellWindowId_AlwaysOnTopContainer:
       return Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS;
 
-    case ash::kShellWindowId_DockedContainer:
+    case kShellWindowId_DockedContainer:
       return Container::USER_PRIVATE_DOCKED_WINDOWS;
 
-    case ash::kShellWindowId_ShelfContainer:
+    case kShellWindowId_ShelfContainer:
       return Container::USER_PRIVATE_SHELF;
 
-    case ash::kShellWindowId_PanelContainer:
+    case kShellWindowId_PanelContainer:
       return Container::USER_PRIVATE_PANELS;
 
-    case ash::kShellWindowId_AppListContainer:
+    case kShellWindowId_AppListContainer:
       return Container::USER_PRIVATE_APP_LIST;
 
-    case ash::kShellWindowId_SystemModalContainer:
+    case kShellWindowId_SystemModalContainer:
       return Container::USER_PRIVATE_SYSTEM_MODAL;
 
-    case ash::kShellWindowId_MenuContainer:
+    case kShellWindowId_MenuContainer:
       return Container::MENUS;
 
-    case ash::kShellWindowId_DragImageAndTooltipContainer:
+    case kShellWindowId_DragImageAndTooltipContainer:
       return Container::DRAG_AND_TOOLTIPS;
 
     default:
@@ -88,28 +88,28 @@ int MashContainerToAshContainer(Container container) {
       return kUnknownAshId;
 
     case Container::USER_PRIVATE_WINDOWS:
-      return ash::kShellWindowId_DefaultContainer;
+      return kShellWindowId_DefaultContainer;
 
     case Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS:
-      return ash::kShellWindowId_AlwaysOnTopContainer;
+      return kShellWindowId_AlwaysOnTopContainer;
 
     case Container::USER_PRIVATE_DOCKED_WINDOWS:
-      return ash::kShellWindowId_DockedContainer;
+      return kShellWindowId_DockedContainer;
 
     case Container::USER_PRIVATE_PRESENTATION_WINDOWS:
       return kUnknownAshId;
 
     case Container::USER_PRIVATE_SHELF:
-      return ash::kShellWindowId_ShelfContainer;
+      return kShellWindowId_ShelfContainer;
 
     case Container::USER_PRIVATE_PANELS:
-      return ash::kShellWindowId_PanelContainer;
+      return kShellWindowId_PanelContainer;
 
     case Container::USER_PRIVATE_APP_LIST:
-      return ash::kShellWindowId_AppListContainer;
+      return kShellWindowId_AppListContainer;
 
     case Container::USER_PRIVATE_SYSTEM_MODAL:
-      return ash::kShellWindowId_SystemModalContainer;
+      return kShellWindowId_SystemModalContainer;
 
     case Container::LOGIN:
       return kUnknownAshId;
@@ -136,10 +136,10 @@ int MashContainerToAshContainer(Container container) {
       return kUnknownAshId;
 
     case Container::MENUS:
-      return ash::kShellWindowId_MenuContainer;
+      return kShellWindowId_MenuContainer;
 
     case Container::DRAG_AND_TOOLTIPS:
-      return ash::kShellWindowId_DragImageAndTooltipContainer;
+      return kShellWindowId_DragImageAndTooltipContainer;
 
     case Container::COUNT:
       return kUnknownAshId;
@@ -147,5 +147,5 @@ int MashContainerToAshContainer(Container container) {
   return kUnknownAshId;
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash