Moves mash/wm into ash/mus

ash/mus/property_util.h

Index: ash/mus/property_util.h
diff --git a/mash/wm/property_util.h b/ash/mus/property_util.h
similarity index 30%
rename from mash/wm/property_util.h
rename to ash/mus/property_util.h
index 5de0c2356d3ecb93e4a7cf3572ad6b61a3283532..023fbb2fc84a0a45e7534ecc9a206bcfa46f3c6d 100644
--- a/mash/wm/property_util.h
+++ b/ash/mus/property_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_PROPERTY_UTIL_H_
-#define MASH_WM_PROPERTY_UTIL_H_
+#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"
@@ -20,60 +20,61 @@ namespace mus {
 class Window;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class Shadow;
 
 // Utility functions to read values from properties & convert them to the
 // appropriate types.
 
-void SetWindowShowState(mus::Window* window, mus::mojom::ShowState show_state);
-mus::mojom::ShowState GetWindowShowState(const mus::Window* window);
+void SetWindowShowState(::mus::Window* window,
+                        ::mus::mojom::ShowState show_state);
+::mus::mojom::ShowState GetWindowShowState(const ::mus::Window* window);
 
-void SetWindowUserSetBounds(mus::Window* window, const gfx::Rect& bounds);
-gfx::Rect GetWindowUserSetBounds(const mus::Window* window);
+void SetWindowUserSetBounds(::mus::Window* window, const gfx::Rect& bounds);
+gfx::Rect GetWindowUserSetBounds(const ::mus::Window* window);
 
-void SetWindowPreferredSize(mus::Window* window, const gfx::Size& size);
-gfx::Size GetWindowPreferredSize(const mus::Window* window);
+void SetWindowPreferredSize(::mus::Window* window, const gfx::Size& size);
+gfx::Size GetWindowPreferredSize(const ::mus::Window* window);
 
-ash::mojom::Container GetRequestedContainer(const mus::Window* window);
+mojom::Container GetRequestedContainer(const ::mus::Window* window);
 
 // Returns a bitfield of kResizeBehavior* values from
 // window_manager_constants.mojom.
-int32_t GetResizeBehavior(const mus::Window* window);
+int32_t GetResizeBehavior(const ::mus::Window* window);
 
-void SetRestoreBounds(mus::Window* window, const gfx::Rect& bounds);
-gfx::Rect GetRestoreBounds(const mus::Window* window);
+void SetRestoreBounds(::mus::Window* window, const gfx::Rect& bounds);
+gfx::Rect GetRestoreBounds(const ::mus::Window* window);
 
-void SetShadow(mus::Window* window, Shadow* shadow);
-Shadow* GetShadow(const mus::Window* window);
+void SetShadow(::mus::Window* window, Shadow* shadow);
+Shadow* GetShadow(const ::mus::Window* window);
 
-mus::mojom::WindowType GetWindowType(const mus::Window* window);
-mus::mojom::WindowType GetWindowType(
-    const mus::Window::SharedProperties& window);
+::mus::mojom::WindowType GetWindowType(const ::mus::Window* window);
+::mus::mojom::WindowType GetWindowType(
+    const ::mus::Window::SharedProperties& window);
 
-ui::wm::WindowType GetWmWindowType(const mus::Window* window);
+ui::wm::WindowType GetWmWindowType(const ::mus::Window* window);
 
-ash::mojom::AshWindowType GetAshWindowType(const mus::Window* window);
+mojom::AshWindowType GetAshWindowType(const ::mus::Window* window);
 
-base::string16 GetWindowTitle(const mus::Window* window);
+base::string16 GetWindowTitle(const ::mus::Window* window);
 
-mojo::Array<uint8_t> GetWindowAppIcon(const mus::Window* window);
+mojo::Array<uint8_t> GetWindowAppIcon(const ::mus::Window* window);
 
-void SetAppID(mus::Window* window, const base::string16& app_id);
-base::string16 GetAppID(const mus::Window* window);
+void SetAppID(::mus::Window* window, const base::string16& app_id);
+base::string16 GetAppID(const ::mus::Window* window);
 
-bool GetWindowIgnoredByShelf(mus::Window* window);
+bool GetWindowIgnoredByShelf(::mus::Window* window);
 
-void SetWindowIsJanky(mus::Window* window, bool janky);
-bool IsWindowJanky(mus::Window* window);
+void SetWindowIsJanky(::mus::Window* window, bool janky);
+bool IsWindowJanky(::mus::Window* window);
 bool IsWindowJankyProperty(const void* key);
 
-void SetAlwaysOnTop(mus::Window* window, bool value);
-bool IsAlwaysOnTop(mus::Window* window);
+void SetAlwaysOnTop(::mus::Window* window, bool value);
+bool IsAlwaysOnTop(::mus::Window* window);
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_PROPERTY_UTIL_H_
+#endif  // ASH_MUS_PROPERTY_UTIL_H_