[exp] ash: Ash in Mus.

ash/mus/wm/non_client_frame_controller.h

Index: ash/mus/wm/non_client_frame_controller.h
diff --git a/mash/wm/non_client_frame_controller.h b/ash/mus/wm/non_client_frame_controller.h
similarity index 87%
copy from mash/wm/non_client_frame_controller.h
copy to ash/mus/wm/non_client_frame_controller.h
index 506dd3612e6d3746e911b8c138e2a3e6c203ca31..843ec6355269e38335d5ca1e24b39a565c890ccb 100644
--- a/mash/wm/non_client_frame_controller.h
+++ b/ash/mus/wm/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_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#define ASH_MUS_WM_NON_CLIENT_FRAME_CONTROLLER_H_
 
 #include <stdint.h>
 
@@ -27,8 +27,8 @@ class WindowTreeHost;
 }
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace muswm {
 
 // Provides the non-client frame for mus Windows.
 class NonClientFrameController : public views::WidgetDelegateView,
@@ -37,7 +37,8 @@ class NonClientFrameController : public views::WidgetDelegateView,
   // NonClientFrameController deletes itself when |window| is destroyed.
   NonClientFrameController(mojo::Shell* shell,
                            mus::Window* window,
-                           mus::mojom::WindowTreeHost* window_tree_host);
+                           mus::mojom::WindowTreeHost* window_tree_host,
+                           aura::Window* aura_root);
 
   // Returns the preferred client area insets.
   static gfx::Insets GetPreferredClientAreaInsets();
@@ -57,7 +58,6 @@ class NonClientFrameController : public views::WidgetDelegateView,
   bool CanResize() const override;
   bool CanMaximize() const override;
   bool CanMinimize() const override;
-  views::ClientView* CreateClientView(views::Widget* widget) override;
 
   // mus::WindowObserver:
   void OnWindowSharedPropertyChanged(
@@ -78,7 +78,7 @@ class NonClientFrameController : public views::WidgetDelegateView,
   DISALLOW_COPY_AND_ASSIGN(NonClientFrameController);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace muswm
+}  // namespace ash
 
-#endif  // MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#endif  // ASH_MUS_WM_NON_CLIENT_FRAME_CONTROLLER_H_