Moves mash/wm into ash/mus

ash/mus/frame/non_client_frame_view_mash.h

Index: ash/mus/frame/non_client_frame_view_mash.h
diff --git a/mash/wm/frame/non_client_frame_view_mash.h b/ash/mus/frame/non_client_frame_view_mash.h
similarity index 79%
rename from mash/wm/frame/non_client_frame_view_mash.h
rename to ash/mus/frame/non_client_frame_view_mash.h
index 6c6c0b1e5bfad0d4abb854113322624e53761142..a6efd85bde52080bb8e609e1df7d9397719b3b20 100644
--- a/mash/wm/frame/non_client_frame_view_mash.h
+++ b/ash/mus/frame/non_client_frame_view_mash.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_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_
-#define MASH_WM_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_
+#ifndef ASH_MUS_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_
+#define ASH_MUS_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/window_observer.h"
@@ -24,19 +24,19 @@ namespace views {
 class Widget;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class FrameCaptionButtonContainerView;
 
 class NonClientFrameViewMash : public views::NonClientFrameView,
-                               public mus::WindowObserver,
-                               public mus::WindowTreeClientObserver {
+                               public ::mus::WindowObserver,
+                               public ::mus::WindowTreeClientObserver {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
-  NonClientFrameViewMash(views::Widget* frame, mus::Window* window);
+  NonClientFrameViewMash(views::Widget* frame, ::mus::Window* window);
   ~NonClientFrameViewMash() override;
 
   static gfx::Insets GetPreferredClientAreaInsets();
@@ -68,12 +68,12 @@ class NonClientFrameViewMash : public views::NonClientFrameView,
 
   // mus::WindowObserver:
   void OnWindowClientAreaChanged(
-      mus::Window* window,
+      ::mus::Window* window,
       const gfx::Insets& old_client_area,
       const std::vector<gfx::Rect>& old_additional_client_area) override;
-  void OnWindowDestroyed(mus::Window* window) override;
+  void OnWindowDestroyed(::mus::Window* window) 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;
@@ -90,13 +90,13 @@ class NonClientFrameViewMash : public views::NonClientFrameView,
   void RemoveObservers();
 
   // mus::WindowTreeClientObserver:
-  void OnWindowTreeFocusChanged(mus::Window* gained_focus,
-                                mus::Window* lost_focus) override;
+  void OnWindowTreeFocusChanged(::mus::Window* gained_focus,
+                                ::mus::Window* lost_focus) override;
 
   // Not owned.
   views::Widget* frame_;
 
-  mus::Window* window_;
+  ::mus::Window* window_;
   ui::PaintCache paint_cache_;
 
   // View which contains the title and window controls.
@@ -106,7 +106,7 @@ class NonClientFrameViewMash : public views::NonClientFrameView,
   DISALLOW_COPY_AND_ASSIGN(NonClientFrameViewMash);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_
+#endif  // ASH_MUS_FRAME_NON_CLIENT_FRAME_VIEW_MASH_H_