Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

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_manager.h"
 #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/screen_util.h"
 #include "ash/shell.h"
 #include "ui/aura/window.h"
+#include "ui/display/manager/display_layout.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
 
 // Maximum size on the display edge that initiate snapping phantom window,
 // from the corner of the display.
@@ skipping 69 matching lines @@
 }
 
 ExtendedMouseWarpController::ExtendedMouseWarpController(
     aura::Window* drag_source)
     : drag_source_root_(drag_source),
       allow_non_native_event_(false) {
   ash::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
   int64_t drag_source_id = drag_source ? GetDisplayIdFromWindow(drag_source)
                                        : gfx::Display::kInvalidDisplayID;
-  DisplayList display_list = display_manager->active_display_list();
+  display::DisplayList display_list = display_manager->active_display_list();
   // Try to create a Warp region for all possible two displays combination.
   // The following code does it by poping the last element in the list
   // and then pairing with remaining displays in the list, until the list
   // becomes single element.
   while (display_list.size() > 1) {
     gfx::Display display = display_list.back();
     display_list.pop_back();
     for (const gfx::Display& peer : display_list) {
       scoped_ptr<WarpRegion> region =
           CreateWarpRegion(display, peer, drag_source_id);
@@ skipping 100 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 make_scoped_ptr(new WarpRegion(a.id(), b.id(), a_edge, b_edge));
 }
 
 }  // namespace ash