Moves mash/wm into ash/mus

ash/mus/user_window_controller_impl.h

Index: ash/mus/user_window_controller_impl.h
diff --git a/mash/wm/user_window_controller_impl.h b/ash/mus/user_window_controller_impl.h
similarity index 55%
rename from mash/wm/user_window_controller_impl.h
rename to ash/mus/user_window_controller_impl.h
index 2f35cf314f5f47a7c1089abbdf19e2640772387c..7859556bb6f8dbdf07f61c5176a6e5b58a3d2ef0 100644
--- a/mash/wm/user_window_controller_impl.h
+++ b/ash/mus/user_window_controller_impl.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_USER_WINDOW_CONTROLLER_IMPL_H_
-#define MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_
+#ifndef ASH_MUS_USER_WINDOW_CONTROLLER_IMPL_H_
+#define ASH_MUS_USER_WINDOW_CONTROLLER_IMPL_H_
 
 #include <stdint.h>
 
@@ -15,59 +15,58 @@
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_client_observer.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class RootWindowController;
 class WindowPropertyObserver;
 
-class UserWindowControllerImpl : public ash::mojom::UserWindowController,
-                                 public mus::WindowObserver,
-                                 public mus::WindowTreeClientObserver {
+class UserWindowControllerImpl : public mojom::UserWindowController,
+                                 public ::mus::WindowObserver,
+                                 public ::mus::WindowTreeClientObserver {
  public:
   UserWindowControllerImpl();
   ~UserWindowControllerImpl() override;
 
-  ash::mojom::UserWindowObserver* user_window_observer() const {
+  mojom::UserWindowObserver* user_window_observer() const {
     return user_window_observer_.get();
   }
 
   void Initialize(RootWindowController* root_controller);
 
  private:
-  void AssignIdIfNecessary(mus::Window* window);
+  void AssignIdIfNecessary(::mus::Window* window);
 
   // Removes observers from the window and client.
-  void RemoveObservers(mus::Window* user_container);
+  void RemoveObservers(::mus::Window* user_container);
 
   // Returns the window with the specified user id.
-  mus::Window* GetUserWindowById(uint32_t id);
+  ::mus::Window* GetUserWindowById(uint32_t id);
 
   // A helper to get the container for user windows.
-  mus::Window* GetUserWindowContainer() const;
+  ::mus::Window* GetUserWindowContainer() const;
 
   // mus::WindowObserver:
   void OnTreeChanging(const TreeChangeParams& params) override;
-  void OnWindowDestroying(mus::Window* window) override;
+  void OnWindowDestroying(::mus::Window* window) override;
 
   // mus::WindowTreeClientObserver:
-  void OnWindowTreeFocusChanged(mus::Window* gained_focus,
-                                mus::Window* lost_focus) override;
+  void OnWindowTreeFocusChanged(::mus::Window* gained_focus,
+                                ::mus::Window* lost_focus) override;
 
   // mojom::UserWindowController:
-  void AddUserWindowObserver(
-      ash::mojom::UserWindowObserverPtr observer) override;
+  void AddUserWindowObserver(mojom::UserWindowObserverPtr observer) override;
   void FocusUserWindow(uint32_t window_id) override;
 
   RootWindowController* root_controller_;
-  ash::mojom::UserWindowObserverPtr user_window_observer_;
+  mojom::UserWindowObserverPtr user_window_observer_;
   std::unique_ptr<WindowPropertyObserver> window_property_observer_;
   uint32_t next_id_ = 1u;
 
   DISALLOW_COPY_AND_ASSIGN(UserWindowControllerImpl);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_
+#endif  // ASH_MUS_USER_WINDOW_CONTROLLER_IMPL_H_