Moves mash/wm into ash/mus

ash/mus/bridge/mus_layout_manager_adapter.h

Index: ash/mus/bridge/mus_layout_manager_adapter.h
diff --git a/mash/wm/bridge/mus_layout_manager_adapter.h b/ash/mus/bridge/mus_layout_manager_adapter.h
similarity index 68%
rename from mash/wm/bridge/mus_layout_manager_adapter.h
rename to ash/mus/bridge/mus_layout_manager_adapter.h
index a9b6e88aa464a8bc4bc2064b157342be80c623ca..f1d0f4009e439a685263429a205096a81bd3ad53 100644
--- a/mash/wm/bridge/mus_layout_manager_adapter.h
+++ b/ash/mus/bridge/mus_layout_manager_adapter.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_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_
-#define MASH_WM_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_
+#ifndef ASH_MUS_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_
+#define ASH_MUS_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_
 
 #include <memory>
 
@@ -14,12 +14,10 @@ namespace ash {
 namespace wm {
 class WmLayoutManager;
 }
-}
 
-namespace mash {
-namespace wm {
+namespace mus {
 
-// Used to associate a mus::Window with an ash::wm::WmLayoutManager. This
+// Used to associate a mus::Window with an wm::WmLayoutManager. This
 // attaches an observer to the mus::Window and calls the appropriate methods on
 // the WmLayoutManager at the appropriate time.
 //
@@ -29,27 +27,26 @@ namespace wm {
 // has no such hook. To ensure SetChildBounds() is called correctly all bounds
 // changes to mus::Windows must be routed through WmWindowMus. WmWindowMus
 // ensures WmLayoutManager::SetChildBounds() is called appropriately.
-class MusLayoutManagerAdapter : public mus::WindowObserver {
+class MusLayoutManagerAdapter : public ::mus::WindowObserver {
  public:
-  MusLayoutManagerAdapter(
-      mus::Window* window,
-      std::unique_ptr<ash::wm::WmLayoutManager> layout_manager);
+  MusLayoutManagerAdapter(::mus::Window* window,
+                          std::unique_ptr<wm::WmLayoutManager> layout_manager);
   ~MusLayoutManagerAdapter() override;
 
-  ash::wm::WmLayoutManager* layout_manager() { return layout_manager_.get(); }
+  wm::WmLayoutManager* layout_manager() { return layout_manager_.get(); }
 
  private:
   // WindowObserver attached to child windows. A separate class is used to
   // easily differentiate WindowObserver calls on the mus::Window associated
   // with the MusLayoutManagerAdapter, vs children.
-  class ChildWindowObserver : public mus::WindowObserver {
+  class ChildWindowObserver : public ::mus::WindowObserver {
    public:
     explicit ChildWindowObserver(MusLayoutManagerAdapter* adapter);
     ~ChildWindowObserver() override;
 
    private:
     // mus::WindowObserver:
-    void OnWindowVisibilityChanged(mus::Window* window) override;
+    void OnWindowVisibilityChanged(::mus::Window* window) override;
 
     MusLayoutManagerAdapter* adapter_;
 
@@ -59,18 +56,18 @@ class MusLayoutManagerAdapter : public mus::WindowObserver {
   // mus::WindowObserver:
   void OnTreeChanging(const TreeChangeParams& params) override;
   void OnTreeChanged(const TreeChangeParams& params) override;
-  void OnWindowBoundsChanged(mus::Window* window,
+  void OnWindowBoundsChanged(::mus::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
 
-  mus::Window* window_;
+  ::mus::Window* window_;
   ChildWindowObserver child_window_observer_;
-  std::unique_ptr<ash::wm::WmLayoutManager> layout_manager_;
+  std::unique_ptr<wm::WmLayoutManager> layout_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MusLayoutManagerAdapter);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_
+#endif  // ASH_MUS_BRIDGE_MUS_LAYOUT_MANAGER_ADAPTER_H_