Moves mash/wm/public -> ash/public

mash/wm/user_window_controller_impl.cc

Index: mash/wm/user_window_controller_impl.cc
diff --git a/mash/wm/user_window_controller_impl.cc b/mash/wm/user_window_controller_impl.cc
index 7e87f01d8acd0e36c6f88b9a09ddb18355330617..884b55209f551616a19d8b542117013b93a3f5d2 100644
--- a/mash/wm/user_window_controller_impl.cc
+++ b/mash/wm/user_window_controller_impl.cc
@@ -4,12 +4,12 @@
 
 #include "mash/wm/user_window_controller_impl.h"
 
+#include "ash/public/interfaces/container.mojom.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "mash/wm/property_util.h"
-#include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/root_window_controller.h"
 #include "mojo/common/common_type_converters.h"
 #include "ui/resources/grit/ui_resources.h"
@@ -32,8 +32,8 @@ mus::Window* GetTopLevelWindow(mus::Window* window, mus::Window* container) {
 }
 
 // Get a UserWindow struct from a mus::Window.
-mojom::UserWindowPtr GetUserWindow(mus::Window* window) {
-  mojom::UserWindowPtr user_window(mojom::UserWindow::New());
+ash::mojom::UserWindowPtr GetUserWindow(mus::Window* window) {
+  ash::mojom::UserWindowPtr user_window(ash::mojom::UserWindow::New());
   DCHECK_NE(0u, window->GetLocalProperty(kUserWindowIdKey));
   user_window->window_id = window->GetLocalProperty(kUserWindowIdKey);
   user_window->window_title = mojo::String::From(GetWindowTitle(window));
@@ -132,7 +132,7 @@ mus::Window* UserWindowControllerImpl::GetUserWindowById(uint32_t id) {
 
 mus::Window* UserWindowControllerImpl::GetUserWindowContainer() const {
   return root_controller_->GetWindowForContainer(
-      mojom::Container::USER_PRIVATE_WINDOWS);
+      ash::mojom::Container::USER_PRIVATE_WINDOWS);
 }
 
 void UserWindowControllerImpl::OnTreeChanging(const TreeChangeParams& params) {
@@ -178,13 +178,13 @@ void UserWindowControllerImpl::OnWindowTreeFocusChanged(
 }
 
 void UserWindowControllerImpl::AddUserWindowObserver(
-    mojom::UserWindowObserverPtr observer) {
+    ash::mojom::UserWindowObserverPtr observer) {
   // TODO(msw): Support multiple observers.
   user_window_observer_ = std::move(observer);
 
   const mus::Window::Children& windows = GetUserWindowContainer()->children();
-  mojo::Array<mojom::UserWindowPtr> user_windows =
-      mojo::Array<mojom::UserWindowPtr>::New(windows.size());
+  mojo::Array<ash::mojom::UserWindowPtr> user_windows =
+      mojo::Array<ash::mojom::UserWindowPtr>::New(windows.size());
   for (size_t i = 0; i < windows.size(); ++i)
     user_windows[i] = GetUserWindow(windows[i]);
   user_window_observer_->OnUserWindowObserverAdded(std::move(user_windows));