Moves mash/wm into ash/mus

ash/mus/window_manager_application.h

Index: ash/mus/window_manager_application.h
diff --git a/mash/wm/window_manager_application.h b/ash/mus/window_manager_application.h
similarity index 74%
rename from mash/wm/window_manager_application.h
rename to ash/mus/window_manager_application.h
index f2cfe62fe2f9232d9e79cd7c29b5bf3034ed9087..adeb3b332c68d7c8b61914024e755eb72106ec8a 100644
--- a/mash/wm/window_manager_application.h
+++ b/ash/mus/window_manager_application.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_WINDOW_MANAGER_APPLICATION_H_
-#define MASH_WM_WINDOW_MANAGER_APPLICATION_H_
+#ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
+#define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
@@ -37,8 +37,8 @@ namespace ui {
 class Event;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class AcceleratorRegistrarImpl;
 class RootWindowController;
@@ -51,10 +51,10 @@ class WmScreen;
 
 class WindowManagerApplication
     : public shell::ShellClient,
-      public mus::mojom::WindowManagerFactory,
-      public shell::InterfaceFactory<ash::mojom::ShelfLayout>,
-      public shell::InterfaceFactory<ash::mojom::UserWindowController>,
-      public shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar> {
+      public ::mus::mojom::WindowManagerFactory,
+      public shell::InterfaceFactory<mojom::ShelfLayout>,
+      public shell::InterfaceFactory<mojom::UserWindowController>,
+      public shell::InterfaceFactory<::mus::mojom::AcceleratorRegistrar> {
  public:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
@@ -85,9 +85,7 @@ class WindowManagerApplication
   void AddRootWindowsObserver(RootWindowsObserver* observer);
   void RemoveRootWindowsObserver(RootWindowsObserver* observer);
 
-  session::mojom::Session* session() {
-    return session_.get();
-  }
+  mash::session::mojom::Session* session() { return session_.get(); }
 
  private:
   friend class WmTestBase;
@@ -104,24 +102,25 @@ class WindowManagerApplication
                   uint32_t id) override;
   bool AcceptConnection(shell::Connection* connection) override;
 
-  // shell::InterfaceFactory<ash::mojom::ShelfLayout>:
+  // shell::InterfaceFactory<mojom::ShelfLayout>:
   void Create(shell::Connection* connection,
-              mojo::InterfaceRequest<ash::mojom::ShelfLayout> request) override;
+              mojo::InterfaceRequest<mojom::ShelfLayout> request) override;
 
-  // shell::InterfaceFactory<ash::mojom::UserWindowController>:
-  void Create(shell::Connection* connection,
-              mojo::InterfaceRequest<ash::mojom::UserWindowController> request)
-      override;
+  // shell::InterfaceFactory<mojom::UserWindowController>:
+  void Create(
+      shell::Connection* connection,
+      mojo::InterfaceRequest<mojom::UserWindowController> request) override;
 
   // shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar>:
   void Create(shell::Connection* connection,
-              mojo::InterfaceRequest<mus::mojom::AcceleratorRegistrar> request)
-      override;
+              mojo::InterfaceRequest<::mus::mojom::AcceleratorRegistrar>
+                  request) override;
 
   // mus::mojom::WindowManagerFactory:
-  void CreateWindowManager(mus::mojom::DisplayPtr display,
-                           mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
-                               client_request) override;
+  void CreateWindowManager(
+      ::mus::mojom::DisplayPtr display,
+      mojo::InterfaceRequest<::mus::mojom::WindowTreeClient> client_request)
+      override;
 
   shell::Connector* connector_;
 
@@ -136,23 +135,23 @@ class WindowManagerApplication
   // The |shelf_layout_| object is created once OnEmbed() is called. Until that
   // time |shelf_layout_requests_| stores pending interface requests.
   std::unique_ptr<ShelfLayoutImpl> shelf_layout_;
-  mojo::BindingSet<ash::mojom::ShelfLayout> shelf_layout_bindings_;
-  std::vector<std::unique_ptr<mojo::InterfaceRequest<ash::mojom::ShelfLayout>>>
+  mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_;
+  std::vector<std::unique_ptr<mojo::InterfaceRequest<mojom::ShelfLayout>>>
       shelf_layout_requests_;
 
   // |user_window_controller_| is created once OnEmbed() is called. Until that
   // time |user_window_controller_requests_| stores pending interface requests.
   std::unique_ptr<UserWindowControllerImpl> user_window_controller_;
-  mojo::BindingSet<ash::mojom::UserWindowController>
+  mojo::BindingSet<mojom::UserWindowController>
       user_window_controller_bindings_;
   std::vector<
-      std::unique_ptr<mojo::InterfaceRequest<ash::mojom::UserWindowController>>>
+      std::unique_ptr<mojo::InterfaceRequest<mojom::UserWindowController>>>
       user_window_controller_requests_;
 
   std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
   std::set<RootWindowController*> root_controllers_;
 
-  mojo::Binding<mus::mojom::WindowManagerFactory>
+  mojo::Binding<::mus::mojom::WindowManagerFactory>
       window_manager_factory_binding_;
 
   mash::session::mojom::SessionPtr session_;
@@ -162,7 +161,7 @@ class WindowManagerApplication
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_WINDOW_MANAGER_APPLICATION_H_
+#endif  // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_