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

ash/autoclick/mus/autoclick_application.cc

Index: ash/autoclick/mus/autoclick_application.cc
diff --git a/ash/autoclick/mus/autoclick_application.cc b/ash/autoclick/mus/autoclick_application.cc
index 06c781542218063ed5df60360b2b940afaa7d048..7ab5aa638a4f3c2f0b3592878d302374819b115d 100644
--- a/ash/autoclick/mus/autoclick_application.cc
+++ b/ash/autoclick/mus/autoclick_application.cc
@@ -4,7 +4,7 @@
 
 #include "ash/autoclick/mus/autoclick_application.h"
 
-#include "ash/public/interfaces/container.mojom.h"
+#include "ash/public/cpp/shell_window_ids.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/service_manager/public/cpp/connector.h"
@@ -104,9 +104,9 @@ void AutoclickApplication::Launch(uint32_t what, mash::mojom::LaunchMode how) {
                                       autoclick_controller_common_.get());
 
     std::map<std::string, std::vector<uint8_t>> properties;
-    properties[ash::mojom::kWindowContainer_Property] =
+    properties[ui::mojom::WindowManager::kInitialContainerId_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
-            static_cast<int32_t>(ash::mojom::Container::OVERLAY));
+            ash::kShellWindowId_OverlayContainer);
     properties[ui::mojom::WindowManager::kShowState_Property] =
         mojo::ConvertTo<std::vector<uint8_t>>(
             static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));