Gets mustash frames looking like that of ash

mash/wm/window_manager_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mash/wm/window_manager_impl.h"
 
 #include "components/mus/common/types.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/interfaces/input_events.mojom.h"
-#include "mash/wm/move_loop.h"
 #include "mash/wm/non_client_frame_controller.h"
 #include "mash/wm/property_util.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "mash/wm/window_manager_application.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 
 namespace mojo {
 
 template <>
@@ skipping 94 matching lines @@
   config->displays[0]->bounds->y = 0;
   config->displays[0]->bounds->width = state_->root()->bounds().width();
   config->displays[0]->bounds->height = state_->root()->bounds().width();
   config->displays[0]->work_area = config->displays[0]->bounds.Clone();
   config->displays[0]->device_pixel_ratio =
       state_->root()->viewport_metrics().device_pixel_ratio;
 
   // The insets are roughly what is needed by CustomFrameView. The expectation
   // is at some point we'll write our own NonClientFrameView and get the insets
   // from it.
-  config->normal_client_area_insets = mojo::Insets::New();
-  config->normal_client_area_insets->top = 23;
-  config->normal_client_area_insets->left = 5;
-  config->normal_client_area_insets->right = 5;
-  config->normal_client_area_insets->bottom = 5;
+  const gfx::Insets client_area_insets =
+      NonClientFrameController::GetPreferredClientAreaInsets();
+  config->normal_client_area_insets = mojo::Insets::From(client_area_insets);
 
-  config->maximized_client_area_insets = mojo::Insets::New();
-  config->maximized_client_area_insets->top = 21;
-  config->maximized_client_area_insets->left = 0;
-  config->maximized_client_area_insets->right = 0;
-  config->maximized_client_area_insets->bottom = 0;
+  config->maximized_client_area_insets = mojo::Insets::From(client_area_insets);
 
   callback.Run(config.Pass());
 }
 
 mus::Window* WindowManagerImpl::GetContainerForChild(mus::Window* child) {
   mash::wm::mojom::Container container = GetRequestedContainer(child);
   return state_->GetWindowForContainer(container);
 }