Gets mustash frames looking like that of ash

mash/wm/non_client_frame_controller.cc

Index: mash/wm/non_client_frame_controller.cc
diff --git a/mash/wm/non_client_frame_controller.cc b/mash/wm/non_client_frame_controller.cc
index b9a95ed384b76d87eb339c6e53ceaaaf9dbe74d0..b0eef4e31359fddc69af51e5a3a470113cb7c86c 100644
--- a/mash/wm/non_client_frame_controller.cc
+++ b/mash/wm/non_client_frame_controller.cc
@@ -5,7 +5,7 @@
 #include "mash/wm/non_client_frame_controller.h"
 
 #include "components/mus/public/cpp/window.h"
-#include "mash/wm/non_client_frame_view_impl.h"
+#include "mash/wm/frame/non_client_frame_view_mash.h"
 #include "mash/wm/property_util.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget.h"
@@ -25,9 +25,10 @@ class WmNativeWidgetMus : public views::NativeWidgetMus {
 
   // NativeWidgetMus:
   views::NonClientFrameView* CreateNonClientFrameView() override {
-    NonClientFrameViewImpl* frame_view = new NonClientFrameViewImpl(window());
-    frame_view->Init(
-        static_cast<views::internal::NativeWidgetPrivate*>(this)->GetWidget());
+    views::Widget* widget =
+        static_cast<views::internal::NativeWidgetPrivate*>(this)->GetWidget();
+    mash::wm::NonClientFrameViewMash* frame_view =
+        new mash::wm::NonClientFrameViewMash(widget, window());
     return frame_view;
   }
   void CenterWindow(const gfx::Size& size) override {
@@ -56,6 +57,11 @@ NonClientFrameController::NonClientFrameController(mojo::Shell* shell,
   widget_->Show();
 }
 
+// static
+gfx::Insets NonClientFrameController::GetPreferredClientAreaInsets() {
+  return mash::wm::NonClientFrameViewMash::GetPreferredClientAreaInsets();
+}
+
 NonClientFrameController::~NonClientFrameController() {
   if (window_)
     window_->RemoveObserver(this);