Change mojo geometry structs from using type converters to StructTraits.

mash/wm/window_manager.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.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "ash/wm/common/container_finder.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 "components/mus/public/interfaces/mus_constants.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mash/wm/bridge/wm_window_mus.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/root_window_controller.h"
-#include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 
 namespace mash {
 namespace wm {
 
 WindowManager::WindowManager()
     : root_controller_(nullptr),
       window_manager_client_(nullptr),
       binding_(this) {}
 
 WindowManager::~WindowManager() {
@@ skipping 22 matching lines @@
     }
   }
 
   // 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.
   mus::mojom::FrameDecorationValuesPtr frame_decoration_values =
       mus::mojom::FrameDecorationValues::New();
   const gfx::Insets client_area_insets =
       NonClientFrameController::GetPreferredClientAreaInsets();
-  frame_decoration_values->normal_client_area_insets =
-      mojo::Insets::From(client_area_insets);
-  frame_decoration_values->maximized_client_area_insets =
-      mojo::Insets::From(client_area_insets);
+  frame_decoration_values->normal_client_area_insets = client_area_insets;
+  frame_decoration_values->maximized_client_area_insets = client_area_insets;
   frame_decoration_values->max_title_bar_button_width =
       NonClientFrameController::GetMaxTitleBarButtonWidth();
   window_manager_client_->SetFrameDecorationValues(
       std::move(frame_decoration_values));
 
   if (session)
     session->AddScreenlockStateListener(binding_.CreateInterfacePtrAndBind());
 }
 
 mus::Window* WindowManager::NewTopLevelWindow(
@@ skipping 124 matching lines @@
 
 void WindowManager::ScreenlockStateChanged(bool locked) {
   // Hide USER_PRIVATE_CONTAINER windows when the screen is locked.
   mus::Window* window = root_controller_->GetWindowForContainer(
       mash::wm::mojom::Container::USER_PRIVATE);
   window->SetVisible(!locked);
 }
 
 }  // namespace wm
 }  // namespace mash