Split //ui/display and create //ui/display/manager.

ash/display/extended_mouse_warp_controller.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 "ash/display/extended_mouse_warp_controller.h"
 
 #include <cmath>
 
 #include "ash/display/display_util.h"
 #include "ash/display/shared_display_edge_indicator.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
-#include "ui/display/manager/display_layout.h"
+#include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/screen.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
@@ skipping 190 matching lines @@
     if (drag_source_id == a.id())
       AdjustSourceEdgeBounds(a.bounds(), snap_barrier, &a_edge);
     else if (drag_source_id == b.id())
       AdjustSourceEdgeBounds(b.bounds(), snap_barrier, &b_edge);
   }
 
   return base::MakeUnique<WarpRegion>(a.id(), b.id(), a_edge, b_edge);
 }
 
 }  // namespace ash