Moves mash/wm into ash/mus

ash/mus/root_window_controller.h

Index: ash/mus/root_window_controller.h
diff --git a/mash/wm/root_window_controller.h b/ash/mus/root_window_controller.h
similarity index 67%
rename from mash/wm/root_window_controller.h
rename to ash/mus/root_window_controller.h
index 80b1b31a4a4f9a19cb444a1499be016e91fc7f75..97c87301b120dae296bb47c48145099079783ee4 100644
--- a/mash/wm/root_window_controller.h
+++ b/ash/mus/root_window_controller.h
@@ -2,25 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_ROOT_WINDOW_CONTROLLER_H_
-#define MASH_WM_ROOT_WINDOW_CONTROLLER_H_
+#ifndef ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
+#define ASH_MUS_ROOT_WINDOW_CONTROLLER_H_
 
 #include <memory>
 
+#include "ash/mus/shelf_layout_manager_delegate.h"
 #include "ash/public/interfaces/container.mojom.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "components/mus/public/cpp/window_tree_client_delegate.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
-#include "mash/wm/shelf_layout_manager_delegate.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "ui/display/display.h"
 
-namespace ash {
-class AlwaysOnTopController;
-}
-
 namespace mus {
 class WindowManagerClient;
 }
@@ -33,8 +29,11 @@ namespace ui {
 class Event;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+
+class AlwaysOnTopController;
+
+namespace mus {
 
 class LayoutManager;
 class ShadowController;
@@ -51,31 +50,31 @@ class WmTestHelper;
 //
 // RootWindowController deletes itself when the root mus::Window is destroyed.
 // You can trigger deletion explicitly by way of Destroy().
-class RootWindowController : public mus::WindowObserver,
-                             public mus::WindowTreeClientDelegate,
+class RootWindowController : public ::mus::WindowObserver,
+                             public ::mus::WindowTreeClientDelegate,
                              public ShelfLayoutManagerDelegate {
  public:
   static RootWindowController* CreateFromDisplay(
       WindowManagerApplication* app,
-      mus::mojom::DisplayPtr display,
-      mojo::InterfaceRequest<mus::mojom::WindowTreeClient> client_request);
+      ::mus::mojom::DisplayPtr display,
+      mojo::InterfaceRequest<::mus::mojom::WindowTreeClient> client_request);
 
   // Deletes this.
   void Destroy();
 
   shell::Connector* GetConnector();
 
-  mus::Window* root() { return root_; }
+  ::mus::Window* root() { return root_; }
 
   int window_count() { return window_count_; }
   void IncrementWindowCount() { ++window_count_; }
 
-  mus::Window* GetWindowForContainer(ash::mojom::Container container);
-  bool WindowIsContainer(const mus::Window* window) const;
+  ::mus::Window* GetWindowForContainer(mojom::Container container);
+  bool WindowIsContainer(const ::mus::Window* window) const;
 
   WindowManager* window_manager() { return window_manager_.get(); }
 
-  mus::WindowManagerClient* window_manager_client();
+  ::mus::WindowManagerClient* window_manager_client();
 
   void OnAccelerator(uint32_t id, const ui::Event& event);
 
@@ -84,7 +83,7 @@ class RootWindowController : public mus::WindowObserver,
   ShelfLayoutManager* GetShelfLayoutManager();
   StatusLayoutManager* GetStatusLayoutManager();
 
-  ash::AlwaysOnTopController* always_on_top_controller() {
+  AlwaysOnTopController* always_on_top_controller() {
     return always_on_top_controller_.get();
   }
 
@@ -100,23 +99,23 @@ class RootWindowController : public mus::WindowObserver,
   void AddAccelerators();
 
   // WindowTreeClientDelegate:
-  void OnEmbed(mus::Window* root) override;
-  void OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) override;
-  void OnEventObserved(const ui::Event& event, mus::Window* target) override;
+  void OnEmbed(::mus::Window* root) override;
+  void OnWindowTreeClientDestroyed(::mus::WindowTreeClient* client) override;
+  void OnEventObserved(const ui::Event& event, ::mus::Window* target) override;
 
-  // mus::WindowObserver:
-  void OnWindowDestroyed(mus::Window* window) override;
+  // ::mus::WindowObserver:
+  void OnWindowDestroyed(::mus::Window* window) override;
 
   // ShelfLayoutManagerDelegate:
   void OnShelfWindowAvailable() override;
 
   // Sets up the window containers used for z-space management.
-  void CreateContainer(ash::mojom::Container container,
-                       ash::mojom::Container parent_container);
+  void CreateContainer(mojom::Container container,
+                       mojom::Container parent_container);
   void CreateContainers();
 
   WindowManagerApplication* app_;
-  mus::Window* root_;
+  ::mus::Window* root_;
   int window_count_;
 
   std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
@@ -124,18 +123,18 @@ class RootWindowController : public mus::WindowObserver,
 
   std::unique_ptr<WindowManager> window_manager_;
 
-  std::map<mus::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
+  std::map<::mus::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
 
   std::unique_ptr<ShadowController> shadow_controller_;
 
   display::Display display_;
 
-  std::unique_ptr<ash::AlwaysOnTopController> always_on_top_controller_;
+  std::unique_ptr<AlwaysOnTopController> always_on_top_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_ROOT_WINDOW_CONTROLLER_H_
+#endif  // ASH_MUS_ROOT_WINDOW_CONTROLLER_H_