Change mojo geometry structs from using type converters to StructTraits.

mash/wm/root_window_controller.cc

 // Copyright 2016 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/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <sstream>
@@ skipping 25 matching lines @@
 #include "mash/wm/fill_layout.h"
 #include "mash/wm/screenlock_layout.h"
 #include "mash/wm/shadow_controller.h"
 #include "mash/wm/shelf_layout_manager.h"
 #include "mash/wm/status_layout_manager.h"
 #include "mash/wm/window_manager.h"
 #include "mash/wm/window_manager_application.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/display/mojo/display_type_converters.h"
-#include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 
 namespace mash {
 namespace wm {
 namespace {
 
 const uint32_t kWindowSwitchAccelerator = 1;
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
@@ skipping 282 matching lines @@
   mus::Window* user_private_panels =
       GetWindowForContainer(mojom::Container::USER_PRIVATE_PANELS);
   WmWindowMus* user_private_panels_wm = WmWindowMus::Get(user_private_panels);
   layout_managers_.erase(user_private_panels);
   user_private_panels_wm->SetLayoutManager(
       base::WrapUnique(new ash::PanelLayoutManager(user_private_panels_wm)));
 }
 
 }  // namespace wm
 }  // namespace mash