mash: Use ash shell window container ids instead of ash::mojom::Container

ash/mus/property_util.cc

Index: ash/mus/property_util.cc
diff --git a/ash/mus/property_util.cc b/ash/mus/property_util.cc
index ea9a2e5812f289ebdc94b25b65b9aabebe1db5e1..9aa2a9f302be21f12d58b2b0fedade91f8f00b4e 100644
--- a/ash/mus/property_util.cc
+++ b/ash/mus/property_util.cc
@@ -9,6 +9,7 @@
 #include "ash/mus/shadow.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window_property.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -72,13 +73,13 @@ gfx::Size GetWindowPreferredSize(const ui::Window* window) {
   return gfx::Size();
 }
 
-bool GetRequestedContainer(const ui::Window* window,
-                           mojom::Container* container) {
-  if (!window->HasSharedProperty(mojom::kWindowContainer_Property))
+bool GetRequestedContainer(const ui::Window* window, int* container_id) {
+  if (!window->HasSharedProperty(
+          ui::mojom::WindowManager::kInitialContainerId_Property))
     return false;
 
-  *container = static_cast<mojom::Container>(
-      window->GetSharedProperty<int32_t>(mojom::kWindowContainer_Property));
+  *container_id = window->GetSharedProperty<int32_t>(
+      ui::mojom::WindowManager::kInitialContainerId_Property);
   return true;
 }