Moves mash/wm into ash/mus

ash/mus/non_client_frame_controller.h

Index: ash/mus/non_client_frame_controller.h
diff --git a/mash/wm/non_client_frame_controller.h b/ash/mus/non_client_frame_controller.h
similarity index 69%
rename from mash/wm/non_client_frame_controller.h
rename to ash/mus/non_client_frame_controller.h
index 48fbdf957f29e0da98bde9df019f2b0917e00f6b..312e318c34ed4f04a903fc9573a99c9d756e1c39 100644
--- a/mash/wm/non_client_frame_controller.h
+++ b/ash/mus/non_client_frame_controller.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_NON_CLIENT_FRAME_CONTROLLER_H_
-#define MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#ifndef ASH_MUS_NON_CLIENT_FRAME_CONTROLLER_H_
+#define ASH_MUS_NON_CLIENT_FRAME_CONTROLLER_H_
 
 #include <stdint.h>
 
@@ -25,18 +25,18 @@ namespace shell {
 class Connector;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // Provides the non-client frame for mus Windows.
 class NonClientFrameController : public views::WidgetDelegateView,
-                                 public mus::WindowObserver {
+                                 public ::mus::WindowObserver {
  public:
   // NonClientFrameController deletes itself when |window| is destroyed.
   static void Create(shell::Connector* connector,
-                     mus::Window* parent,
-                     mus::Window* window,
-                     mus::WindowManagerClient* window_manager_client);
+                     ::mus::Window* parent,
+                     ::mus::Window* window,
+                     ::mus::WindowManagerClient* window_manager_client);
 
   // Returns the preferred client area insets.
   static gfx::Insets GetPreferredClientAreaInsets();
@@ -45,13 +45,13 @@ class NonClientFrameController : public views::WidgetDelegateView,
   // title bar.
   static int GetMaxTitleBarButtonWidth();
 
-  mus::Window* window() { return window_; }
+  ::mus::Window* window() { return window_; }
 
  private:
   NonClientFrameController(shell::Connector* connector,
-                           mus::Window* parent,
-                           mus::Window* window,
-                           mus::WindowManagerClient* window_manager_client);
+                           ::mus::Window* parent,
+                           ::mus::Window* window,
+                           ::mus::WindowManagerClient* window_manager_client);
   ~NonClientFrameController() override;
 
   // views::WidgetDelegateView:
@@ -65,25 +65,25 @@ class NonClientFrameController : public views::WidgetDelegateView,
 
   // mus::WindowObserver:
   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;
-  void OnWindowLocalPropertyChanged(mus::Window* window,
+  void OnWindowLocalPropertyChanged(::mus::Window* window,
                                     const void* key,
                                     intptr_t old) override;
-  void OnWindowDestroyed(mus::Window* window) override;
+  void OnWindowDestroyed(::mus::Window* window) override;
 
   views::Widget* widget_;
 
   // WARNING: as widget delays destruction there is a portion of time when this
   // is null.
-  mus::Window* window_;
+  ::mus::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientFrameController);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#endif  // ASH_MUS_NON_CLIENT_FRAME_CONTROLLER_H_