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

ash/mus/property_util.h

 // 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.
 
 #ifndef ASH_MUS_PROPERTY_UTIL_H_
 #define ASH_MUS_PROPERTY_UTIL_H_
 
 #include "ash/public/interfaces/ash_window_type.mojom.h"
-#include "ash/public/interfaces/container.mojom.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/wm/public/window_types.h"
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
 namespace ui {
@@ skipping 10 matching lines @@
 
 void SetWindowShowState(ui::Window* window, ui::mojom::ShowState show_state);
 ui::mojom::ShowState GetWindowShowState(const ui::Window* window);
 
 void SetWindowUserSetBounds(ui::Window* window, const gfx::Rect& bounds);
 gfx::Rect GetWindowUserSetBounds(const ui::Window* window);
 
 void SetWindowPreferredSize(ui::Window* window, const gfx::Size& size);
 gfx::Size GetWindowPreferredSize(const ui::Window* window);
 
-// If |window| has the |kWindowContainer_Property| set as a property, then
-// the value of |kWindowContainer_Property| is set in |container| and true is
-// returned. Otherwise false is returned.
-bool GetRequestedContainer(const ui::Window* window,
-                           mojom::Container* container);
+// If |window| has the |kInitialContainerId_Property| set as a property, then
+// the value of |kInitialContainerId_Property| is set in |container_id| and true
+// is returned. Otherwise false is returned.
+bool GetRequestedContainer(const ui::Window* window, int* container_id);
 
 // Returns a bitfield of kResizeBehavior* values from
 // window_manager_constants.mojom.
 void SetResizeBehavior(ui::Window::SharedProperties* properties,
                        int32_t resize_behavior);
 int32_t GetResizeBehavior(const ui::Window* window);
 
 void SetRestoreBounds(ui::Window* window, const gfx::Rect& bounds);
 gfx::Rect GetRestoreBounds(const ui::Window* window);
 
@@ skipping 36 matching lines @@
 // Manipulates the kExcludeFromMru_Property property.
 void SetExcludeFromMru(ui::Window* window, bool value);
 
 // Returns true if the property is set and true, otherwise false.
 bool GetExcludeFromMru(const ui::Window* window);
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_PROPERTY_UTIL_H_