Moves mash/wm into ash/mus

ash/mus/window_manager.h

Index: ash/mus/window_manager.h
diff --git a/mash/wm/window_manager.h b/ash/mus/window_manager.h
similarity index 58%
rename from mash/wm/window_manager.h
rename to ash/mus/window_manager.h
index c0937468edb4345d69ef82105bc6ab0e23020f51..eeb605ad677e73a08be37e54997c5396a057cfa7 100644
--- a/mash/wm/window_manager.h
+++ b/ash/mus/window_manager.h
@@ -2,13 +2,14 @@
 // 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_H_
-#define MASH_WM_WINDOW_MANAGER_H_
+#ifndef ASH_MUS_WINDOW_MANAGER_H_
+#define ASH_MUS_WINDOW_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
 
+#include "ash/mus/disconnected_app_handler.h"
 #include "base/macros.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/cpp/window_manager_delegate.h"
@@ -16,65 +17,65 @@
 #include "components/mus/public/cpp/window_tracker.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mash/session/public/interfaces/session.mojom.h"
-#include "mash/wm/disconnected_app_handler.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class RootWindowController;
 
-class WindowManager : public mus::WindowTracker,
-                      public mus::WindowManagerDelegate,
-                      public session::mojom::ScreenlockStateListener {
+class WindowManager : public ::mus::WindowTracker,
+                      public ::mus::WindowManagerDelegate,
+                      public mash::session::mojom::ScreenlockStateListener {
  public:
   WindowManager();
   ~WindowManager() override;
 
   void Initialize(RootWindowController* root_controller,
-                  session::mojom::Session* session);
+                  mash::session::mojom::Session* session);
 
-  mus::WindowManagerClient* window_manager_client() {
+  ::mus::WindowManagerClient* window_manager_client() {
     return window_manager_client_;
   }
 
   // Creates a new top level window.
-  mus::Window* NewTopLevelWindow(
+  ::mus::Window* NewTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties);
 
  private:
-  gfx::Rect CalculateDefaultBounds(mus::Window* window) const;
+  gfx::Rect CalculateDefaultBounds(::mus::Window* window) const;
   gfx::Rect GetMaximizedWindowBounds() const;
 
-  // mus::WindowObserver:
+  // ::mus::WindowObserver:
   void OnTreeChanging(const TreeChangeParams& params) override;
 
   // WindowManagerDelegate:
-  void SetWindowManagerClient(mus::WindowManagerClient* client) override;
-  bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override;
+  void SetWindowManagerClient(::mus::WindowManagerClient* client) override;
+  bool OnWmSetBounds(::mus::Window* window, gfx::Rect* bounds) override;
   bool OnWmSetProperty(
-      mus::Window* window,
+      ::mus::Window* window,
       const std::string& name,
       std::unique_ptr<std::vector<uint8_t>>* new_data) override;
-  mus::Window* OnWmCreateTopLevelWindow(
+  ::mus::Window* OnWmCreateTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties) override;
-  void OnWmClientJankinessChanged(const std::set<mus::Window*>& client_windows,
-                                  bool not_responding) override;
+  void OnWmClientJankinessChanged(
+      const std::set<::mus::Window*>& client_windows,
+      bool not_responding) override;
   void OnAccelerator(uint32_t id, const ui::Event& event) override;
 
   // session::mojom::ScreenlockStateListener:
   void ScreenlockStateChanged(bool locked) override;
 
   RootWindowController* root_controller_;
-  mus::WindowManagerClient* window_manager_client_;
+  ::mus::WindowManagerClient* window_manager_client_;
   DisconnectedAppHandler disconnected_app_handler_;
 
-  mojo::Binding<session::mojom::ScreenlockStateListener> binding_;
+  mojo::Binding<mash::session::mojom::ScreenlockStateListener> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManager);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_WINDOW_MANAGER_H_
+#endif  // ASH_MUS_WINDOW_MANAGER_H_