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

ash/mus/property_util.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/property_util.h"
 
 #include <stdint.h>
 
 #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"
 
 namespace {
 
 MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ash::mus::Shadow*,
                                      kLocalShadowProperty,
                                      nullptr);
 MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(bool, kWindowIsJankyProperty, false);
 
@@ skipping 43 matching lines @@
 
 gfx::Size GetWindowPreferredSize(const ui::Window* window) {
   if (window->HasSharedProperty(
           ui::mojom::WindowManager::kPreferredSize_Property)) {
     return window->GetSharedProperty<gfx::Size>(
         ui::mojom::WindowManager::kPreferredSize_Property);
   }
   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;
 }
 
 void SetResizeBehavior(ui::Window::SharedProperties* properties,
                        int32_t resize_behavior) {
   (*properties)[ui::mojom::WindowManager::kResizeBehavior_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(resize_behavior);
 }
 
 int32_t GetResizeBehavior(const ui::Window* window) {
@@ skipping 180 matching lines @@
 
 bool GetExcludeFromMru(const ui::Window* window) {
   return window->HasSharedProperty(
              ui::mojom::WindowManager::kExcludeFromMru_Property) &&
          window->GetSharedProperty<bool>(
              ui::mojom::WindowManager::kExcludeFromMru_Property);
 }
 
 }  // namespace mus
 }  // namespace ash