Moves mash/wm/public -> ash/public

mash/wm/container_ids.cc

Index: mash/wm/container_ids.cc
diff --git a/mash/wm/container_ids.cc b/mash/wm/container_ids.cc
index be5e7b77422a275e512acf00f7e345e50d174b3e..a9440b643a38e8ef2157c7fadf241e316958a22e 100644
--- a/mash/wm/container_ids.cc
+++ b/mash/wm/container_ids.cc
@@ -4,144 +4,144 @@
 
 #include "mash/wm/container_ids.h"
 
+#include "ash/public/interfaces/container.mojom.h"
 #include "ash/wm/common/wm_shell_window_ids.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
+
+using ash::mojom::Container;
 
 namespace mash {
 namespace wm {
 
-const mojom::Container kActivationContainers[] = {
+const Container kActivationContainers[] = {
     // TODO(sky): figure out right set of containers. I suspect this should be
     // all non containers.
-    mojom::Container::USER_PRIVATE_WINDOWS,
-    mojom::Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS,
-    mojom::Container::USER_PRIVATE_DOCKED_WINDOWS,
-    mojom::Container::USER_PRIVATE_PRESENTATION_WINDOWS,
-    mojom::Container::USER_PRIVATE_PANELS,
-    mojom::Container::USER_PRIVATE_APP_LIST,
-    mojom::Container::USER_PRIVATE_SYSTEM_MODAL,
-    mojom::Container::LOGIN,
+    Container::USER_PRIVATE_WINDOWS,
+    Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS,
+    Container::USER_PRIVATE_DOCKED_WINDOWS,
+    Container::USER_PRIVATE_PRESENTATION_WINDOWS,
+    Container::USER_PRIVATE_PANELS, Container::USER_PRIVATE_APP_LIST,

[msw, 2016/06/01 01:51:42]

nnit: Hmm, this is one case where I might disagree with git cl format...

[sky, 2016/06/01 03:30:26]

Agreed. But I'm not fighting it..

+    Container::USER_PRIVATE_SYSTEM_MODAL, Container::LOGIN,
     // Bubble windows must be allowed to activate because some of them rely on
     // deactivation to close.
-    mojom::Container::BUBBLES,
+    Container::BUBBLES,
 };
 
 const size_t kNumActivationContainers = arraysize(kActivationContainers);
 
-mojom::Container AshContainerToMashContainer(int ash_id) {
+Container AshContainerToMashContainer(int ash_id) {
   switch (ash_id) {
     case ash::kShellWindowId_UnparentedControlContainer:
     case ash::kShellWindowId_LockScreenContainer:
     case ash::kShellWindowId_LockSystemModalContainer:
       // We should never be asked to parent windows of these types.
       NOTREACHED();
-      return mojom::Container::USER_PRIVATE;
+      return Container::USER_PRIVATE;
 
     case ash::kShellWindowId_DefaultContainer:
-      return mojom::Container::USER_PRIVATE_WINDOWS;
+      return Container::USER_PRIVATE_WINDOWS;
 
     case ash::kShellWindowId_AlwaysOnTopContainer:
-      return mojom::Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS;
+      return Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS;
 
     case ash::kShellWindowId_DockedContainer:
-      return mojom::Container::USER_PRIVATE_DOCKED_WINDOWS;
+      return Container::USER_PRIVATE_DOCKED_WINDOWS;
 
     case ash::kShellWindowId_ShelfContainer:
-      return mojom::Container::USER_PRIVATE_SHELF;
+      return Container::USER_PRIVATE_SHELF;
 
     case ash::kShellWindowId_PanelContainer:
-      return mojom::Container::USER_PRIVATE_PANELS;
+      return Container::USER_PRIVATE_PANELS;
 
     case ash::kShellWindowId_AppListContainer:
-      return mojom::Container::USER_PRIVATE_APP_LIST;
+      return Container::USER_PRIVATE_APP_LIST;
 
     case ash::kShellWindowId_SystemModalContainer:
-      return mojom::Container::USER_PRIVATE_SYSTEM_MODAL;
+      return Container::USER_PRIVATE_SYSTEM_MODAL;
 
     case ash::kShellWindowId_MenuContainer:
-      return mojom::Container::MENUS;
+      return Container::MENUS;
 
     case ash::kShellWindowId_DragImageAndTooltipContainer:
-      return mojom::Container::DRAG_AND_TOOLTIPS;
+      return Container::DRAG_AND_TOOLTIPS;
 
     default:
       NOTREACHED();
   }
-  return mojom::Container::USER_PRIVATE_WINDOWS;
+  return Container::USER_PRIVATE_WINDOWS;
 }
 
-int MashContainerToAshContainer(mojom::Container container) {
+int MashContainerToAshContainer(Container container) {
   switch (container) {
-    case mojom::Container::ROOT:
+    case Container::ROOT:
       return kUnknownAshId;
 
-    case mojom::Container::ALL_USER_BACKGROUND:
+    case Container::ALL_USER_BACKGROUND:
       return kUnknownAshId;
 
-    case mojom::Container::USER:
+    case Container::USER:
       return kUnknownAshId;
 
-    case mojom::Container::USER_BACKGROUND:
+    case Container::USER_BACKGROUND:
       return kUnknownAshId;
 
-    case mojom::Container::USER_PRIVATE:
+    case Container::USER_PRIVATE:
       return kUnknownAshId;
 
-    case mojom::Container::USER_PRIVATE_WINDOWS:
+    case Container::USER_PRIVATE_WINDOWS:
       return ash::kShellWindowId_DefaultContainer;
 
-    case mojom::Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS:
+    case Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS:
       return ash::kShellWindowId_AlwaysOnTopContainer;
 
-    case mojom::Container::USER_PRIVATE_DOCKED_WINDOWS:
+    case Container::USER_PRIVATE_DOCKED_WINDOWS:
       return ash::kShellWindowId_DockedContainer;
 
-    case mojom::Container::USER_PRIVATE_PRESENTATION_WINDOWS:
+    case Container::USER_PRIVATE_PRESENTATION_WINDOWS:
       return kUnknownAshId;
 
-    case mojom::Container::USER_PRIVATE_SHELF:
+    case Container::USER_PRIVATE_SHELF:
       return ash::kShellWindowId_ShelfContainer;
 
-    case mojom::Container::USER_PRIVATE_PANELS:
+    case Container::USER_PRIVATE_PANELS:
       return ash::kShellWindowId_PanelContainer;
 
-    case mojom::Container::USER_PRIVATE_APP_LIST:
+    case Container::USER_PRIVATE_APP_LIST:
       return ash::kShellWindowId_AppListContainer;
 
-    case mojom::Container::USER_PRIVATE_SYSTEM_MODAL:
+    case Container::USER_PRIVATE_SYSTEM_MODAL:
       return ash::kShellWindowId_SystemModalContainer;
 
-    case mojom::Container::LOGIN:
+    case Container::LOGIN:
       return kUnknownAshId;
 
-    case mojom::Container::LOGIN_WINDOWS:
+    case Container::LOGIN_WINDOWS:
       return kUnknownAshId;
 
-    case mojom::Container::LOGIN_APP:
+    case Container::LOGIN_APP:
       return kUnknownAshId;
 
-    case mojom::Container::LOGIN_SHELF:
+    case Container::LOGIN_SHELF:
       return kUnknownAshId;
 
-    case mojom::Container::STATUS:
+    case Container::STATUS:
       return kUnknownAshId;
 
-    case mojom::Container::BUBBLES:
+    case Container::BUBBLES:
       return kUnknownAshId;
 
-    case mojom::Container::SYSTEM_MODAL_WINDOWS:
+    case Container::SYSTEM_MODAL_WINDOWS:
       return kUnknownAshId;
 
-    case mojom::Container::KEYBOARD:
+    case Container::KEYBOARD:
       return kUnknownAshId;
 
-    case mojom::Container::MENUS:
+    case Container::MENUS:
       return ash::kShellWindowId_MenuContainer;
 
-    case mojom::Container::DRAG_AND_TOOLTIPS:
+    case Container::DRAG_AND_TOOLTIPS:
       return ash::kShellWindowId_DragImageAndTooltipContainer;
 
-    case mojom::Container::COUNT:
+    case Container::COUNT:
       return kUnknownAshId;
   }
   return kUnknownAshId;