Index: mash/wm/property_util.h |
diff --git a/mash/wm/property_util.h b/mash/wm/property_util.h |
index 703d4e6e774afbbb2ae7cf9632c15f85ad3e66ab..5de0c2356d3ecb93e4a7cf3572ad6b61a3283532 100644 |
--- a/mash/wm/property_util.h |
+++ b/mash/wm/property_util.h |
@@ -5,10 +5,10 @@ |
#ifndef MASH_WM_PROPERTY_UTIL_H_ |
#define MASH_WM_PROPERTY_UTIL_H_ |
+#include "ash/public/interfaces/ash_window_type.mojom.h" |
+#include "ash/public/interfaces/container.mojom.h" |
#include "components/mus/public/cpp/window.h" |
#include "components/mus/public/interfaces/window_manager_constants.mojom.h" |
-#include "mash/wm/public/interfaces/ash_window_type.mojom.h" |
-#include "mash/wm/public/interfaces/container.mojom.h" |
#include "ui/wm/public/window_types.h" |
namespace gfx { |
@@ -37,7 +37,7 @@ gfx::Rect GetWindowUserSetBounds(const mus::Window* window); |
void SetWindowPreferredSize(mus::Window* window, const gfx::Size& size); |
gfx::Size GetWindowPreferredSize(const mus::Window* window); |
-mojom::Container GetRequestedContainer(const mus::Window* window); |
+ash::mojom::Container GetRequestedContainer(const mus::Window* window); |
// Returns a bitfield of kResizeBehavior* values from |
// window_manager_constants.mojom. |
@@ -55,7 +55,7 @@ mus::mojom::WindowType GetWindowType( |
ui::wm::WindowType GetWmWindowType(const mus::Window* window); |
-mojom::AshWindowType GetAshWindowType(const mus::Window* window); |
+ash::mojom::AshWindowType GetAshWindowType(const mus::Window* window); |
base::string16 GetWindowTitle(const mus::Window* window); |