Moves mash/wm into ash/mus

ash/mus/layout_manager.h

Index: ash/mus/layout_manager.h
diff --git a/mash/wm/layout_manager.h b/ash/mus/layout_manager.h
similarity index 63%
rename from mash/wm/layout_manager.h
rename to ash/mus/layout_manager.h
index 7edb8d94e6a3a2bbf6882d38eb87c8cbe4d256a1..6712f0cd9b37428d89b24f986eaa4443555bd4dc 100644
--- a/mash/wm/layout_manager.h
+++ b/ash/mus/layout_manager.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_LAYOUT_MANAGER_H_
-#define MASH_WM_LAYOUT_MANAGER_H_
+#ifndef ASH_MUS_LAYOUT_MANAGER_H_
+#define ASH_MUS_LAYOUT_MANAGER_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/window_observer.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // Base class for container layout managers. Derived classes override
 // LayoutWindow() to perform layout and register properties to which
@@ -19,46 +19,46 @@ namespace wm {
 // LayoutManagers observe both the bound container and all its children.
 // They must be attached prior to any windows being added to the
 // container.
-class LayoutManager : public mus::WindowObserver {
+class LayoutManager : public ::mus::WindowObserver {
  public:
   ~LayoutManager() override;
 
  protected:
-  explicit LayoutManager(mus::Window* owner);
+  explicit LayoutManager(::mus::Window* owner);
 
   void Uninstall();
 
   // Overridden from mus::WindowObserver:
   void OnTreeChanged(
-      const mus::WindowObserver::TreeChangeParams& params) override;
-  void OnWindowDestroying(mus::Window* window) override;
-  void OnWindowBoundsChanged(mus::Window* window,
+      const ::mus::WindowObserver::TreeChangeParams& params) override;
+  void OnWindowDestroying(::mus::Window* window) override;
+  void OnWindowBoundsChanged(::mus::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
   void OnWindowSharedPropertyChanged(
-      mus::Window* window,
+      ::mus::Window* window,
       const std::string& name,
       const std::vector<uint8_t>* old_data,
       const std::vector<uint8_t>* new_data) override;
 
-  virtual void WindowAdded(mus::Window* window);
-  virtual void WindowRemoved(mus::Window* window);
-  virtual void LayoutWindow(mus::Window* window) = 0;
+  virtual void WindowAdded(::mus::Window* window);
+  virtual void WindowRemoved(::mus::Window* window);
+  virtual void LayoutWindow(::mus::Window* window) = 0;
 
   // Add a property that triggers layout when changed.
   void AddLayoutProperty(const std::string& property);
 
-  mus::Window* owner() { return owner_; }
+  ::mus::Window* owner() { return owner_; }
 
  private:
-  mus::Window* owner_;
+  ::mus::Window* owner_;
 
   std::set<std::string> layout_properties_;
 
   DISALLOW_COPY_AND_ASSIGN(LayoutManager);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_LAYOUT_MANAGER_H_
+#endif  // ASH_MUS_LAYOUT_MANAGER_H_